check_http.t: - added internet_access variable to skip tests where internet access is required.

              - added host_tcp_http2 variable for a webserver serving the string 'nagios' in index
              - no tests are skipped if the new vars are not defined (existing installations)


git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1669 f882894a-f735-0410-b71e-b25c423dba1c

plugins/t/check_http.t

@@ -27,6 +27,18 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
 		"An invalid (not known to DNS) hostname",  
 		"nosuchhost");
 
+my $internet_access = getTestParameter( "NP_INTERNET_ACCESS",
+                "Is this system directly connected to the internet?",
+                "yes");
+
+my $host_tcp_http2;
+if ($internet_access eq "no") {
+    $host_tcp_http2     = getTestParameter( "NP_HOST_TCP_HTTP2", 
+            "A host providing an index page containing the string 'nagios'", 
+            "altinity.com" );
+}
+
+
 $res = NPTest->testCmd(
 	"./check_http $host_tcp_http -wt 300 -ct 600"
 	);
@@ -58,52 +70,62 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
 # Is also possible to get a socket timeout if DNS is not responding fast enough
 like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK");
 
-$res = NPTest->testCmd(
-	"./check_http --ssl www.verisign.com"
-	);
-cmp_ok( $res->return_code, '==', 0, "Can read https for www.verisign.com" );
+SKIP: {
+        skip "No internet access and no host serving nagios in index file",
+              7 if $internet_access eq "no" && ! $host_tcp_http2;
 
-$res = NPTest->testCmd( "./check_http -C 1 --ssl www.verisign.com" );
-cmp_ok( $res->return_code, '==', 0, "Checking certificate for www.verisign.com");
-like  ( $res->output, '/Certificate will expire on/', "Output OK" );
-my $saved_cert_output = $res->output;
+        $host_tcp_http2 = "altinity.com" if (! $host_tcp_http2);
 
-$res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
-is( $res->return_code, 0, "Old syntax for cert checking okay" );
-is( $res->output, $saved_cert_output, "Same output as new syntax" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" );
+        cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'");
 
-$res = NPTest->testCmd( "./check_http -H www.verisign.com -C 1" );
-is( $res->return_code, 0, "Updated syntax for cert checking okay" );
-is( $res->output, $saved_cert_output, "Same output as new syntax" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs'" );
+        cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'");
+        like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'");
 
-$res = NPTest->testCmd( "./check_http -C 1 www.verisign.com" );
-cmp_ok( $res->output, 'eq', $saved_cert_output, "--ssl option automatically added");
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -R 'nAGiOs'" );
+        cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'");
 
-$res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
-cmp_ok( $res->output, 'eq', $saved_cert_output, "Old syntax for cert checking still works");
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios' --invert-regex" );
+        cmp_ok( $res->return_code, "==", 2, "Invert results work when found");
+        like ( $res->output, "/pattern found/", "Error message says 'pattern found'");
 
-$res = NPTest->testCmd(
-	"./check_http --ssl www.e-paycobalt.com"
-	);
-cmp_ok( $res->return_code, "==", 0, "Can read https for www.e-paycobalt.com (uses AES certificate)" );
+        $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nAGiOs' --invert-regex" );
+        cmp_ok( $res->return_code, "==", 0, "And also when not found");
+}
+SKIP: {
+        skip "No internet access", 11 if $internet_access eq "no";
+
+        $res = NPTest->testCmd(
+                "./check_http --ssl www.verisign.com"
+                );
+        cmp_ok( $res->return_code, '==', 0, "Can read https for www.verisign.com" );
+
+        $res = NPTest->testCmd( "./check_http -C 1 --ssl www.verisign.com" );
+        cmp_ok( $res->return_code, '==', 0, "Checking certificate for www.verisign.com");
+        like  ( $res->output, '/Certificate will expire on/', "Output OK" );
+        my $saved_cert_output = $res->output;
 
-$res = NPTest->testCmd( "./check_http -H altinity.com -r 'nagios'" );
-cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'");
+        $res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
+        is( $res->return_code, 0, "Old syntax for cert checking okay" );
+        is( $res->output, $saved_cert_output, "Same output as new syntax" );
 
-$res = NPTest->testCmd( "./check_http -H altinity.com -r 'nAGiOs'" );
-cmp_ok( $res->return_code, "==", 2, "Not got 'nAGiOs'");
-like ( $res->output, "/pattern not found/", "Error message says 'pattern not found'");
+        $res = NPTest->testCmd( "./check_http -H www.verisign.com -C 1" );
+        is( $res->return_code, 0, "Updated syntax for cert checking okay" );
+        is( $res->output, $saved_cert_output, "Same output as new syntax" );
 
-$res = NPTest->testCmd( "./check_http -H altinity.com -R 'nAGiOs'" );
-cmp_ok( $res->return_code, "==", 0, "But case insensitive doesn't mind 'nAGiOs'");
+        $res = NPTest->testCmd( "./check_http -C 1 www.verisign.com" );
+        cmp_ok( $res->output, 'eq', $saved_cert_output, "--ssl option automatically added");
 
-$res = NPTest->testCmd( "./check_http -H altinity.com -r 'nagios' --invert-regex" );
-cmp_ok( $res->return_code, "==", 2, "Invert results work when found");
-like ( $res->output, "/pattern found/", "Error message says 'pattern found'");
+        $res = NPTest->testCmd( "./check_http www.verisign.com -C 1" );
+        cmp_ok( $res->output, 'eq', $saved_cert_output, "Old syntax for cert checking still works");
 
-$res = NPTest->testCmd( "./check_http -H altinity.com -r 'nAGiOs' --invert-regex" );
-cmp_ok( $res->return_code, "==", 0, "And also when not found");
+        $res = NPTest->testCmd(
+                "./check_http --ssl www.e-paycobalt.com"
+                );
+        cmp_ok( $res->return_code, "==", 0, "Can read https for www.e-paycobalt.com (uses AES certificate)" );
 
-$res = NPTest->testCmd( "./check_http -H www.mozilla.com -u /firefox -f follow" );
-is( $res->return_code, 0, "Redirection based on location is okay");
 
+        $res = NPTest->testCmd( "./check_http -H www.mozilla.com -u /firefox -f follow" );
+        is( $res->return_code, 0, "Redirection based on location is okay");
+}