File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -523,7 +523,11 @@ def thinmark
523
523
524
524
module_function :thinmark
525
525
526
- PUPPET_STACK_INSERTION_FRAME = /.*puppet_stack\. rb.*in.*`stack'/
526
+ PUPPET_STACK_INSERTION_FRAME = if RUBY_VERSION >= '3.4'
527
+ /.*puppet_stack\. rb.*in.*'Puppet::Pops::PuppetStack\. stack'/
528
+ else
529
+ /.*puppet_stack\. rb.*in.*`stack'/
530
+ end
527
531
528
532
# utility method to get the current call stack and format it to a human-readable string (which some IDEs/editors
529
533
# will recognize as links to the line numbers in the trace)
Original file line number Diff line number Diff line change @@ -455,7 +455,7 @@ def run(exception_class)
455
455
expect ( log . message ) . to_not match ( '/logging_spec.rb' )
456
456
expect ( log . backtrace [ 0 ] ) . to match ( '/logging_spec.rb' )
457
457
458
- expect ( log . backtrace . any? { | l | l =~ /\/ tmp\/ test2\. pp:20/ } ) . to be true
458
+ expect ( log . backtrace ) . to include ( /\/ tmp\/ test2\. pp:20/ )
459
459
puppetstack = log . backtrace . select { |l | l =~ /tmp\/ test\d \. pp/ }
460
460
461
461
expect ( puppetstack . length ) . to eq ( 3 )
You can’t perform that action at this time.
0 commit comments