]> review.fuel-infra Code Review - puppet-modules/puppetlabs-firewall.git/commitdiff
Change fact variables in tests.
authorRobert Frank <rwf14f@gmail.com>
Mon, 9 Sep 2019 13:06:25 +0000 (14:06 +0100)
committerRobert Frank <rwf14f@gmail.com>
Mon, 9 Sep 2019 13:06:25 +0000 (14:06 +0100)
spec/acceptance/firewall_attributes_happy_path_spec.rb
spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb

index 122e492b3f2ffb8a6653baf09531345c0d4d50e4..5b0411a4a10000069d65da3275587f2febba8d2d 100644 (file)
@@ -505,7 +505,7 @@ describe 'firewall attribute testing, happy path' do
   end
 
   describe 'test CT target attributes which are not available on some OS', unless:
-      (os[:family] == 'redhat' && (os[:release].start_with?('5', '6') || os[:name] == 'OracleLinux')) || (os[:family] == 'Suse') do
+      (os[:family] == 'redhat' && (os[:release].start_with?('5', '6') || host_inventory['facter']['os']['name'] == 'OracleLinux')) || (host_inventory['facter']['os']['family'] == 'Suse') do
     before(:all) do
       pp = <<-PUPPETCODE
           firewall { '1100 - ct_target tests - zone':
index 7b268e648d29c6eeb2f3095b70af538e8323e2c8..5ef9ba53f2522f434551394b2bdb6ffddb4a5336 100644 (file)
@@ -369,7 +369,7 @@ describe 'firewall attribute testing, happy path', unless: (os[:family] == 'redh
   end
 
   describe 'test CT target attributes which are not available on some OS', unless:
-      (os[:family] == 'redhat' && (os[:release].start_with?('5', '6') || os[:name] == 'OracleLinux')) || (os[:family] == 'Suse') do
+      (os[:family] == 'redhat' && (os[:release].start_with?('5', '6') || host_inventory['facter']['os']['name'] == 'OracleLinux')) || (host_inventory['facter']['os']['family'] == 'Suse') do
     before(:all) do
       pp = <<-PUPPETCODE
           firewall { '1100 - ct_target tests - zone':