Parcourir la source

corrected http test

multiple headers have to be set by multiple -k switches. Seperating them
by semicolons is not longer supported as semicolons are valid characters in
http headers.
Sven Nierlein il y a 12 ans
Parent
commit
2e6a0138de
1 fichiers modifiés avec 3 ajouts et 8 suppressions
  1. 3 8
      plugins/t/check_http.t

+ 3 - 8
plugins/t/check_http.t

@@ -8,7 +8,7 @@ use strict;
 use Test::More;
 use Test::More;
 use NPTest;
 use NPTest;
 
 
-plan tests => 28;
+plan tests => 27;
 
 
 my $successOutput = '/OK.*HTTP.*second/';
 my $successOutput = '/OK.*HTTP.*second/';
 
 
@@ -45,14 +45,9 @@ cmp_ok( $res->return_code, '==', 0, "Webserver $host_tcp_http responded" );
 like( $res->output, $successOutput, "Output OK" );
 like( $res->output, $successOutput, "Output OK" );
 
 
 $res = NPTest->testCmd(
 $res = NPTest->testCmd(
-	"./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there;fred:here'"
+	"./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there' -k 'carl:frown'"
 	);
 	);
-like( $res->output, '/bob:there\r\nfred:here\r\n/', "Got headers, delimited with ';'" );
-
-$res = NPTest->testCmd(
-	"./check_http $host_tcp_http -wt 300 -ct 600 -v -v -v -k 'bob:there;fred:here' -k 'carl:frown'"
-	);
-like( $res->output, '/bob:there\r\nfred:here\r\ncarl:frown\r\n/', "Got headers with multiple -k options" );
+like( $res->output, '/bob:there\r\ncarl:frown\r\n/', "Got headers with multiple -k options" );
 
 
 $res = NPTest->testCmd(
 $res = NPTest->testCmd(
 	"./check_http $host_nonresponsive -wt 1 -ct 2"
 	"./check_http $host_nonresponsive -wt 1 -ct 2"