Merge pull request #2596 from mhashizume/maint/main/test-updates

(maint) Test Updates
puppetlabs · Jul 31, 2023 · a95d1b4 · a95d1b4
2 parents a3236ae + d7361c7
commit a95d1b4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 11 deletions.
diff --git a/acceptance/lib/facter/acceptance/base_fact_utils.rb b/acceptance/lib/facter/acceptance/base_fact_utils.rb
@@ -256,7 +256,7 @@ def osx_expected_facts(agent)
           'os.hardware' => os_hardware,
           'os.name' => 'Darwin',
           'os.macosx.build' => /\d+[A-Z]\d{1,4}\w?/,
-          'os.macosx.product' => agent['platform'] =~ /osx-10/ ? 'Mac OS X' : 'macOS',
+          'os.macosx.product' => 'macOS',
           'os.macosx.version.major' => major_version,
           'os.macosx.version.minor' => /\d+/,
           'os.release.full' => /\d+\.\d+\.\d+/,
@@ -272,15 +272,11 @@ def osx_expected_facts(agent)
           'kernelmajversion' => /\d+\.\d+/
         }
 
-        if agent['platform'] =~ /osx-10/
-          expected_facts['os.macosx.version.full'] = /#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}/
+        expected_facts['os.macosx.version.patch'] = /\d+/
+        if agent['platform'] =~ /arm64/ && agent['platform'].split('-')[1].to_i < 13
+          expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}$/
         else
-          expected_facts['os.macosx.version.patch'] = /\d+/
-          if agent['platform'] =~ /arm64/ && agent['platform'].split('-')[1].to_i < 13
-            expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}$/
-          else
-            expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}\.*#{expected_facts['os.macosx.version.patch']}*$/
-          end
+          expected_facts['os.macosx.version.full'] = /^#{expected_facts['os.macosx.version.major']}\.#{expected_facts['os.macosx.version.minor']}\.*#{expected_facts['os.macosx.version.patch']}*$/
         end
         expected_facts
       end

diff --git a/acceptance/tests/facts/ruby.rb b/acceptance/tests/facts/ruby.rb
@@ -14,7 +14,7 @@
   agents.each do |agent|
     step "Ensure the Ruby fact resolves as expected" do
       puppet_version = on(agent, puppet("--version")).stdout.chomp
-      ruby_version   = if puppet_version =~ /^(6|7)\./
+      ruby_version   = if puppet_version =~ /^7\./
                          /2\.\d+\.\d+/
                        else
                          /3\.\d+\.\d+/
@@ -25,7 +25,7 @@
           ruby_platform = agent['ruby_arch'] == 'x64' ? 'x64-mingw32' : 'i386-mingw32'
         when /osx/
           if agent['platform'] =~ /arm64/
-            if puppet_version =~ /^(6|7)\./ && agent['platform'].split('-')[1].to_i < 13
+            if puppet_version =~ /^7\./ && agent['platform'].split('-')[1].to_i < 13
               ruby_platform = /aarch64-darwin/
             else
               ruby_platform = /arm64-darwin/