From c001fb98ffb162d6cd148047a3737c78aa737eca Mon Sep 17 00:00:00 2001
From: Sven Nierlein <Sven.Nierlein@consol.de>
Date: Mon, 16 Sep 2013 13:30:21 +0200
Subject: check_http: tests use supplied value if possible


diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 9948c53..f77387d 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -30,12 +30,9 @@ 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",
+my $host_tcp_http2  = getTestParameter( "NP_HOST_TCP_HTTP2",
             "A host providing an index page containing the string 'nagios'",
-            "www.nagios.com" );
-}
+            "nagiosplugins.org" );
 
 
 $res = NPTest->testCmd(
@@ -65,10 +62,7 @@ cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
 like( $res->output, "/Unable to open TCP socket|Socket timeout after/", "Output OK");
 
 SKIP: {
-        skip "No internet access and no host serving nagios in index file",
-              7 if $internet_access eq "no" && ! $host_tcp_http2;
-
-        $host_tcp_http2 = "www.nagios.com" if (! $host_tcp_http2);
+        skip "No host serving nagios in index file", 7 unless $host_tcp_http2;
 
         $res = NPTest->testCmd( "./check_http -H $host_tcp_http2 -r 'nagios'" );
         cmp_ok( $res->return_code, "==", 0, "Got a reference to 'nagios'");
-- 
cgit v0.10-9-g596f