Use modern facts in acceptance tests

theforeman · Nov 12, 2023 · 8ae2b15 · 8ae2b15
1 parent c398f96
commit 8ae2b15
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/spec/acceptance/basic_spec.rb b/spec/acceptance/basic_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'Simple installation' do
   interface = 'eth0'
-  config_file = fact('osfamily') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
+  config_file = fact('os.family') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
 
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do
@@ -18,7 +18,7 @@ class { 'dhcp':
         mask    => $interface['netmask'],
       }
 
-      dhcp::host { $facts['fqdn']:
+      dhcp::host { $facts['networking']['fqdn']:
         ip  => $interface['ip'],
         mac => $interface['mac'],
       }

diff --git a/spec/acceptance/nameservers_spec.rb b/spec/acceptance/nameservers_spec.rb
@@ -2,7 +2,7 @@
 
 describe 'with empty nameservers list' do
   interface = 'eth0'
-  config_file = fact('osfamily') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
+  config_file = fact('os.family') == 'Archlinux' ? '/etc/dhcpd.conf' : '/etc/dhcp/dhcpd.conf'
 
   it_behaves_like 'an idempotent resource' do
     let(:manifest) do