Skip to content

Commit 4ad4205

Browse files
authored
Merge pull request #8960 from joshcooper/bump_jruby
(maint) Bump to jruby 9.2.21.0
2 parents f7eb1b0 + a71c6f4 commit 4ad4205

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/workflows/rspec_tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- {os: ubuntu-latest, ruby: '2.6'}
2121
- {os: ubuntu-latest, ruby: '2.7'}
2222
- {os: ubuntu-latest, ruby: '3.0'}
23-
- {os: ubuntu-latest, ruby: 'jruby-9.2.17.0'}
23+
- {os: ubuntu-latest, ruby: 'jruby-9.2.21.0'}
2424
- {os: windows-2019, ruby: '2.5'}
2525
- {os: windows-2019, ruby: '2.6'}
2626
- {os: windows-2019, ruby: '2.7'}

spec/unit/file_system_spec.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,9 +819,11 @@ def increment_counter_in_multiple_processes(file, num_procs, options)
819819
mode = Puppet::FileSystem.stat(dir).mode
820820
Puppet::FileSystem.chmod(0, dir)
821821
begin
822+
# JRuby 9.2.21.0 drops the path from the message..
823+
message = Puppet::Util::Platform.jruby? ? /^Permission denied/ : /^Permission denied .* #{path}/
822824
expect {
823825
Puppet::FileSystem.unlink(path)
824-
}.to raise_error(Errno::EACCES, /^Permission denied .* #{path}/)
826+
}.to raise_error(Errno::EACCES, message)
825827
ensure
826828
Puppet::FileSystem.chmod(mode, dir)
827829
end

0 commit comments

Comments
 (0)