From 64de477753c87ec53531c5408a4ab5e1a384ca19 Mon Sep 17 00:00:00 2001
From: Antonin Dvorak <43780131+dvo-rak@users.noreply.github.com>
Date: Thu, 21 Sep 2023 16:39:48 +0200
Subject: [PATCH] Proper testing with tftp.socket service

---
 spec/acceptance/tftp_port_spec.rb | 6 +++---
 spec/acceptance/tftp_spec.rb      | 4 ++--
 spec/setup_acceptance_node.pp     | 7 +++++++
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/spec/acceptance/tftp_port_spec.rb b/spec/acceptance/tftp_port_spec.rb
index 46df096..98be28d 100644
--- 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
index 94a8382..f42a19e 100644
--- 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
index 0551aad..65c0687 100644
--- 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,
+  }
+}