[Test] Wait for ports to be confirmed-free inbetween runs

12 files changed, 26 insertions, 10 deletions

diff --git a/test/functional/cases/120_fuzzy/encrypted.robot b/test/functional/cases/120_fuzzy/encrypted.robot
index 21fd87908..8268b234b 100644
--- a/test/functional/cases/120_fuzzy/encrypted.robot
+++ b/test/functional/cases/120_fuzzy/encrypted.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Encrypted Siphash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/fasthash-keyed.robot b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
index d135eaca0..8f949fceb 100644
--- a/test/functional/cases/120_fuzzy/fasthash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/fasthash-keyed.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Keyed Fasthash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/fasthash.robot b/test/functional/cases/120_fuzzy/fasthash.robot
index 75d596c73..cf0503622 100644
--- a/test/functional/cases/120_fuzzy/fasthash.robot
+++ b/test/functional/cases/120_fuzzy/fasthash.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Plain Fasthash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/general.robot b/test/functional/cases/120_fuzzy/general.robot
index 7d1b0171a..eb54f3733 100644
--- a/test/functional/cases/120_fuzzy/general.robot
+++ b/test/functional/cases/120_fuzzy/general.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Plain Siphash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/lib.robot b/test/functional/cases/120_fuzzy/lib.robot
index bde6e2dc5..79c19891b 100644
--- a/test/functional/cases/120_fuzzy/lib.robot
+++ b/test/functional/cases/120_fuzzy/lib.robot
@@ -143,3 +143,10 @@ Fuzzy Multimessage Delete Test
 Fuzzy Multimessage Overwrite Test
   : FOR  ${i}  IN  @{MESSAGES}
   \  Fuzzy Overwrite Test  ${i}
+
+Fuzzy Teardown
+  ${port_normal} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_NORMAL}
+  ${port_fuzzy} =  Create List  ${SOCK_DGRAM}  ${LOCAL_ADDR}  ${PORT_FUZZY}
+  ${port_controller} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_CONTROLLER}
+  ${ports} =  Create List  ${port_normal}  ${port_fuzzy}  ${port_controller}
+  Generic Teardown  @{ports}
diff --git a/test/functional/cases/120_fuzzy/mumhash-keyed.robot b/test/functional/cases/120_fuzzy/mumhash-keyed.robot
index cfef38e57..770da125a 100644
--- a/test/functional/cases/120_fuzzy/mumhash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/mumhash-keyed.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Keyed Mumhash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/mumhash.robot b/test/functional/cases/120_fuzzy/mumhash.robot
index 6e2714b64..5dd47aead 100644
--- a/test/functional/cases/120_fuzzy/mumhash.robot
+++ b/test/functional/cases/120_fuzzy/mumhash.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Plain Mumhash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/replication.robot b/test/functional/cases/120_fuzzy/replication.robot
index cb7d42533..8a3b875ed 100644
--- a/test/functional/cases/120_fuzzy/replication.robot
+++ b/test/functional/cases/120_fuzzy/replication.robot
@@ -82,3 +82,12 @@ Replication Teardown
   Cleanup Temporary Directory  ${SLAVE_TMPDIR}
   Remove File  ${TMP_INCLUDE1}
   Remove File  ${TMP_INCLUDE2}
+  ${port_normal} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_NORMAL}
+  ${port_fuzzy} =  Create List  ${SOCK_DGRAM}  ${LOCAL_ADDR}  ${PORT_FUZZY}
+  ${port_controller} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_CONTROLLER}
+  ${port_normal_slave} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_NORMAL_SLAVE}
+  ${port_fuzzy_slave} =  Create List  ${SOCK_DGRAM}  ${LOCAL_ADDR}  ${PORT_FUZZY_SLAVE}
+  ${port_controller_slave} =  Create List  ${SOCK_STREAM}  ${LOCAL_ADDR}  ${PORT_CONTROLLER_SLAVE}
+  ${ports} =  Create List  ${port_normal}  ${port_fuzzy}  ${port_controller}  ${port_normal_slave}  ${port_fuzzy_slave}  ${port_controller_slave}
+  : FOR  ${i}  IN  @{ports}
+  \  Wait For Port  @{i}[0]  @{i}[1]  @{i}[2]
diff --git a/test/functional/cases/120_fuzzy/siphash-keyed.robot b/test/functional/cases/120_fuzzy/siphash-keyed.robot
index 6ed321ca9..0acef322c 100644
--- a/test/functional/cases/120_fuzzy/siphash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/siphash-keyed.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Keyed Siphash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/siphash.robot b/test/functional/cases/120_fuzzy/siphash.robot
index 5ede462de..66d3d01d2 100644
--- a/test/functional/cases/120_fuzzy/siphash.robot
+++ b/test/functional/cases/120_fuzzy/siphash.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Plain Siphash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/xxhash-keyed.robot b/test/functional/cases/120_fuzzy/xxhash-keyed.robot
index b9840dc0d..a5d7f49a3 100644
--- a/test/functional/cases/120_fuzzy/xxhash-keyed.robot
+++ b/test/functional/cases/120_fuzzy/xxhash-keyed.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Keyed Xxhash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***
diff --git a/test/functional/cases/120_fuzzy/xxhash.robot b/test/functional/cases/120_fuzzy/xxhash.robot
index 4cb7fef75..e0fc346c8 100644
--- a/test/functional/cases/120_fuzzy/xxhash.robot
+++ b/test/functional/cases/120_fuzzy/xxhash.robot
@@ -1,6 +1,6 @@
 *** Settings ***
 Suite Setup     Fuzzy Setup Plain Xxhash
-Suite Teardown  Generic Teardown
+Suite Teardown  Fuzzy Teardown
 Resource        lib.robot
 
 *** Test Cases ***