From eb75d847ae31a86768b06926bc2323f7c16f07b9 Mon Sep 17 00:00:00 2001
From: Sven Nierlein <sven@nierlein.de>
Date: Thu, 20 May 2021 18:04:49 +0200
Subject: tests: increase startup sleep

github action might fail from to time otherwise
---
 plugins/tests/check_http.t | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'plugins/tests/check_http.t')

diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index 2f051fad..0f56950f 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -102,8 +102,6 @@ if ($pid) {
 			exit;
 		}
 	}
-	# give our webservers some time to startup
-	sleep(1);
 } else {
 	# Child
 	#print "child\n";
@@ -116,6 +114,9 @@ if ($pid) {
 	exit;
 }
 
+# give our webservers some time to startup
+sleep(3);
+
 # Run the same server on http and https
 sub run_server {
 	my $d = shift;
-- 
cgit v1.2.3-74-g34f1


From b428cc17f75682465e6f1e59b32fdec02b87ceac Mon Sep 17 00:00:00 2001
From: Sven Nierlein <sven@nierlein.de>
Date: Thu, 20 May 2021 20:57:59 +0200
Subject: tests: ignore sigpipes in https test daemon

check_http closes the connection after checking the certificate with -C. This leads to sigpipe
errors when the ssl daemon wants to send a response and the daemon quits which makes the
subsequent tests fail.
---
 plugins/tests/check_http.t | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

(limited to 'plugins/tests/check_http.t')

diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t
index 0f56950f..188f5e75 100755
--- a/plugins/tests/check_http.t
+++ b/plugins/tests/check_http.t
@@ -91,6 +91,8 @@ if ($pid) {
 				exit;
 			}
 		} else {
+			# closing the connection after -C cert checks make the daemon exit with a sigpipe otherwise
+			local $SIG{'PIPE'} = 'IGNORE';
 			my $d = HTTP::Daemon::SSL->new(
 				LocalPort => $port_https,
 				LocalAddr => "127.0.0.1",
@@ -415,22 +417,24 @@ sub run_common_tests {
 
 	# stickyport - on full urlS port is set back to 80 otherwise
 	$cmd = "$command -f stickyport -u /redir_external -t 5 -s redirected";
+	alarm(2);
 	eval {
 		local $SIG{ALRM} = sub { die "alarm\n" };
-		alarm(2);
 		$result = NPTest->testCmd( $cmd );
-		alarm(0);	};
+	};
 	isnt( $@, "alarm\n", $cmd );
+	alarm(0);
 	is( $result->return_code, 0, $cmd );
 
 	# Let's hope there won't be any web server on :80 returning "redirected"!
 	$cmd = "$command -f sticky -u /redir_external -t 5 -s redirected";
+	alarm(2);
 	eval {
 		local $SIG{ALRM} = sub { die "alarm\n" };
-		alarm(2);
 		$result = NPTest->testCmd( $cmd );
-		alarm(0); };
+	};
 	isnt( $@, "alarm\n", $cmd );
+	alarm(0);
 	isnt( $result->return_code, 0, $cmd );
 
 	# Test an external address - timeout
-- 
cgit v1.2.3-74-g34f1