Tests converted to new style

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

1 files changed, 18 insertions, 4 deletions

diff --git a/plugins/t/check_http.t b/plugins/t/check_http.t
index 9b90fd06..24e4fd6d 100644
--- a/plugins/t/check_http.t
+++ b/plugins/t/check_http.t
@@ -9,6 +9,8 @@ use strict;
 use Test::More;
 use NPTest;
 
+plan tests => 12;
+
 my $successOutput = '/OK.*HTTP.*second/';
 
 my $res;
@@ -25,9 +27,6 @@ my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
                 "An invalid (not known to DNS) hostname",  
                 "nosuchhost");
 
-plan tests => 8;
-
-
 $res = NPTest->testCmd(
         "./check_http $host_tcp_http -wt 300 -ct 600"
         );
@@ -44,14 +43,29 @@ $res = NPTest->testCmd(
         "./check_http $hostname_invalid -wt 1 -ct 2"
         );
 cmp_ok( $res->return_code, '==', 2, "Webserver $hostname_invalid not valid" );
-like( $res->output, "/Name or service not known.*/", "Output OK");
+# The first part of the message comes from the OS catalogue, so cannot check this.
+# On Debian, it is Name or service not known, on Darwin, it is No address associated with nodename
+like( $res->output, "/Unable to open TCP socket/", "Output OK");
 
 $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 -C 1 www.verisign.com" );
+cmp_ok( $res->output, 'eq', $saved_cert_output, "--ssl option automatically added");
+
+$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 --ssl www.e-paycobalt.com"
         );
 cmp_ok( $res->return_code, "==", 0, "Can read https for www.e-paycobalt.com (uses AES certificate)" );
+
+