Proper testing with tftp.socket service

theforeman · Sep 21, 2023 · 64de477 · 64de477
1 parent 8030ed5
commit 64de477
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/spec/acceptance/tftp_port_spec.rb b/spec/acceptance/tftp_port_spec.rb
@@ -30,12 +30,12 @@ class { 'tftp':
     it { is_expected.to be_running }
   end
 
-  describe port(69), unless: service_name.end_with?('.socket') do
+  describe port(69)  do
     it { is_expected.not_to be_listening }
   end
 
-  describe port(1234), unless: service_name.end_with?('.socket') do
-    it { is_expected.to be_listening.with('udp') }
+  describe port(1234)  do
+    it { is_expected.to be_listening.with('udp').or be_listening.with('udp6') }
   end
 
   describe 'ensure tftp client is installed' do

diff --git a/spec/acceptance/tftp_spec.rb b/spec/acceptance/tftp_spec.rb
@@ -28,8 +28,8 @@ class { 'tftp': }
     it { is_expected.to be_running }
   end
 
-  describe port(69), unless: service_name.end_with?('.socket') do
-    it { is_expected.to be_listening.with('udp') }
+  describe port(69) do
+    it { is_expected.to be_listening.with('udp').or be_listening.with('udp6') }
   end
 
   describe command("echo get /test /tmp/downloaded_file | tftp #{fact('fqdn')}") do

diff --git a/spec/setup_acceptance_node.pp b/spec/setup_acceptance_node.pp
@@ -4,3 +4,10 @@
     ensure => installed,
   }
 }
+
+# without it "ss" command is not found and "port listening" tests fail
+if $facts['os']['name'] == 'Fedora' {
+  package {'iproute':
+    ensure => installed,
+  }
+}