diff --git a/.github/workflows/rspec_tests.yaml b/.github/workflows/rspec_tests.yaml index bbeabbfe648..61a66d89557 100644 --- a/.github/workflows/rspec_tests.yaml +++ b/.github/workflows/rspec_tests.yaml @@ -19,7 +19,7 @@ jobs: - {os: ubuntu-latest, ruby: '3.1'} - {os: ubuntu-20.04, ruby: '3.2'} # openssl 1.1.1 - {os: ubuntu-22.04, ruby: '3.2'} # openssl 3 - - {os: ubuntu-latest, ruby: 'jruby-9.4.3.0'} + - {os: ubuntu-latest, ruby: 'jruby-9.4.7.0'} - {os: windows-2019, ruby: '3.1'} - {os: windows-2019, ruby: '3.2'} # openssl 3 diff --git a/lib/puppet/node/environment.rb b/lib/puppet/node/environment.rb index 08ef63f2750..d7ac5735998 100644 --- a/lib/puppet/node/environment.rb +++ b/lib/puppet/node/environment.rb @@ -593,9 +593,7 @@ def perform_initial_import if file == NO_MANIFEST empty_parse_result elsif File.directory?(file) - # JRuby does not properly perform Dir.glob operations with wildcards, (see PUP-11788 and https://github.com/jruby/jruby/issues/7836). - # We sort the results because Dir.glob order is inconsistent in Ruby < 3 (see PUP-10115). - parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*')).glob.select { |globbed_file| globbed_file.end_with?('.pp') }.sort.map do |file_to_parse| + parse_results = Puppet::FileSystem::PathPattern.absolute(File.join(file, '**/*.pp')).glob.map do |file_to_parse| parser.file = file_to_parse parser.parse end diff --git a/spec/unit/file_system/path_pattern_spec.rb b/spec/unit/file_system/path_pattern_spec.rb index 8948dab9497..d32452bc4eb 100644 --- a/spec/unit/file_system/path_pattern_spec.rb +++ b/spec/unit/file_system/path_pattern_spec.rb @@ -1,7 +1,6 @@ require 'spec_helper' require 'puppet_spec/files' require 'puppet/file_system' -require 'puppet/util' describe Puppet::FileSystem::PathPattern do include PuppetSpec::Files @@ -134,9 +133,6 @@ end it 'globs wildcard patterns properly' do - # See PUP-11788 and https://github.com/jruby/jruby/issues/7836. - pending 'JRuby does not properly handle Dir.glob' if Puppet::Util::Platform.jruby? - dir = tmpdir('globtest') create_file_in(dir, 'foo.pp') create_file_in(dir, 'foo.pp.pp') diff --git a/spec/unit/pops/types/string_converter_spec.rb b/spec/unit/pops/types/string_converter_spec.rb index af2b6398a15..903a8517dc4 100644 --- a/spec/unit/pops/types/string_converter_spec.rb +++ b/spec/unit/pops/types/string_converter_spec.rb @@ -316,7 +316,6 @@ '%.1f' => '18.0', }.each do |fmt, result | it "the format #{fmt} produces #{result}" do - pending("PUP-8612 %a and %A not support on JRuby") if RUBY_PLATFORM == 'java' && fmt =~ /^%[aA]$/ string_formats = { Puppet::Pops::Types::PIntegerType::DEFAULT => fmt} expect(converter.convert(18, string_formats)).to eq(result) end @@ -410,7 +409,6 @@ '%#B' => '0B10010', }.each do |fmt, result | it "the format #{fmt} produces #{result}" do - pending("PUP-8612 %a and %A not support on JRuby") if RUBY_PLATFORM == 'java' && fmt =~ /^%[-.014]*[aA]$/ string_formats = { Puppet::Pops::Types::PFloatType::DEFAULT => fmt} expect(converter.convert(18.0, string_formats)).to eq(result) end @@ -587,7 +585,6 @@ "%#Y" => 'Y', }.each do |fmt, result | it "the format #{fmt} produces #{result}" do - pending("PUP-8612 %a and %A not support on JRuby") if RUBY_PLATFORM == 'java' && fmt =~ /^%[aA]$/ string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => fmt} expect(converter.convert(true, string_formats)).to eq(result) end @@ -634,7 +631,6 @@ "%#Y" => 'N', }.each do |fmt, result | it "the format #{fmt} produces #{result}" do - pending("PUP-8612 %a and %A not support on JRuby") if RUBY_PLATFORM == 'java' && fmt =~ /^%[aA]$/ string_formats = { Puppet::Pops::Types::PBooleanType::DEFAULT => fmt} expect(converter.convert(false, string_formats)).to eq(result) end