CI: Fix --reconn tests for Windows

cytopia · May 8, 2020 · 485287b · 485287b
1 parent df96c92
commit 485287b
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 21 deletions.
diff --git a/...nn---three_servers---server_default---srv_down_cli_send-srv_nosend-srv_nosend-srv_send.sh b/...nn---three_servers---server_default---srv_down_cli_send-srv_nosend-srv_nosend-srv_send.sh
@@ -85,7 +85,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "(Connection refused)|(timed out)"
 
 
 	###
@@ -119,7 +119,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -177,7 +177,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -192,7 +192,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -226,7 +226,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -250,7 +250,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	###

diff --git a/...conn---three_servers---server_default---srv_down_cli_send-srv_nosend-srv_send-srv_send.sh b/...conn---three_servers---server_default---srv_down_cli_send-srv_nosend-srv_send-srv_send.sh
@@ -85,7 +85,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "(Connection refused)|(timed out)"
 
 
 	###
@@ -119,7 +119,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -143,7 +143,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -177,7 +177,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -201,7 +201,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -235,7 +235,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -259,7 +259,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	###

diff --git a/...reconn---three_servers---server_default---srv_down_cli_send-srv_send-srv_send-srv_send.sh b/...reconn---three_servers---server_default---srv_down_cli_send-srv_send-srv_send-srv_send.sh
@@ -85,7 +85,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "" "" "" "" "(Connection refused)|(timed out)"
 
 
 	###
@@ -119,7 +119,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -152,7 +152,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv1_stdout}" "${srv1_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -186,7 +186,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -210,7 +210,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv2_stdout}" "${srv2_stderr}" "(Connection refused)|(timed out)"
 
 
 	###
@@ -244,7 +244,7 @@ run_test() {
 	test_case_instance_is_running "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	# --------------------------------------------------------------------------------
@@ -268,7 +268,7 @@ run_test() {
 	test_case_instance_has_no_errors "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}"
 
 	# [CLIENT] Ensure Client still has no errors
-	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "Connection refused"
+	test_case_instance_has_no_errors "Client" "${cli_pid}" "${cli_stdout}" "${cli_stderr}" "Server" "${srv_pid}" "${srv3_stdout}" "${srv3_stderr}" "(Connection refused)|(timed out)"
 
 
 	###