From 46c09b647dac7e75e3fd0b0df37e28590f732020 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 27 Jun 2022 10:56:34 -0700 Subject: [PATCH 1/2] (maint) Cleanup whitespace --- ...re_facter_3_and_facter_4_output_matches.rb | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb b/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb index 6c90697660..71f5cc7302 100644 --- a/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb +++ b/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb @@ -6,16 +6,16 @@ exclude_list = %w{mountpoints\..* partitions\..*\.filesystem partitions\..*\.size_bytes - partitions\..*\.mount + partitions\..*\.mount partitions\..*\.uuid - ldom_.* - boardassettag - dmi\.board\.asset_tag - is_virtual - kernelmajversion - lsbmajdistrelease - zones - virtual + ldom_.* + boardassettag + dmi\.board\.asset_tag + is_virtual + kernelmajversion + lsbmajdistrelease + zones + virtual blockdevice_.*_vendor blockdevice_.*_size hypervisors.vmware.version os\.distro\.description } @@ -26,16 +26,15 @@ step 'run puppet facts diff ' do on agent, puppet('facts diff') do @diff = stdout - end end step 'compare Facter 3 to Facter 4 outputs' do - join_str = agent.platform =~ /windows/ ? '^^^|' : '|' + join_str = agent.platform =~ /windows/ ? '^^^|' : '|' ignored_facts = exclude_list.join(join_str) on(agent, puppet("facts diff --exclude '#{ignored_facts}'")) do diff = JSON.parse(stdout) - + rep_diff = diff.delete_if {|key, value| value['old_value'] == nil} fail_test("Facter 3 and Facter 4 outputs have the following differences: #{diff}") if rep_diff.keys.size.positive? end From aa6e458092c24966d48a8517f0790ba50112f078 Mon Sep 17 00:00:00 2001 From: Josh Cooper Date: Mon, 27 Jun 2022 11:03:58 -0700 Subject: [PATCH 2/2] (maint) Ignore os.release.major related fact diffs on Window 11 --- .../tests/ensure_facter_3_and_facter_4_output_matches.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb b/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb index 71f5cc7302..30d3d3f262 100644 --- a/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb +++ b/acceptance/tests/ensure_facter_3_and_facter_4_output_matches.rb @@ -22,6 +22,13 @@ agents.each do |agent| exclude_list += ['macosx_productversion.*', 'os.macosx.version'] if agent.platform =~ /^osx-1[1-9]/ + # FACT-3039 was only fixed in facter 4 + exclude_list += %w[ + operatingsystemrelease + operatingsystemmajrelease + os.release.full + os.release.major + ] if agent.platform =~ /windows-11/ step 'run puppet facts diff ' do on agent, puppet('facts diff') do