From 03b27f09aa99ca9e0c5a91273b9b9b1aabef8b00 Mon Sep 17 00:00:00 2001 From: Robert Frank Date: Mon, 9 Sep 2019 14:06:25 +0100 Subject: [PATCH] Change fact variables in tests. --- spec/acceptance/firewall_attributes_happy_path_spec.rb | 2 +- spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/spec/acceptance/firewall_attributes_happy_path_spec.rb b/spec/acceptance/firewall_attributes_happy_path_spec.rb index 122e492..5b0411a 100644 --- a/spec/acceptance/firewall_attributes_happy_path_spec.rb +++ b/spec/acceptance/firewall_attributes_happy_path_spec.rb @@ -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': diff --git a/spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb b/spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb index 7b268e6..5ef9ba5 100644 --- a/spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb +++ b/spec/acceptance/firewall_attributes_ipv6_happy_path_spec.rb @@ -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': -- 2.45.2