diff options
author | Holger Weiss <holger@zedat.fu-berlin.de> | 2012-08-10 10:49:30 (GMT) |
---|---|---|
committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2012-08-10 10:49:30 (GMT) |
commit | 66003414af98e3bd2ee7a50e2bcaa28da9746dff (patch) | |
tree | ef0215fb49af8f0862d4b57a9499b11c068b5a2b | |
parent | 3f944a50b78b662e44efb585d0da08b8333e4c7b (diff) | |
download | monitoring-plugins-66003414af98e3bd2ee7a50e2bcaa28da9746dff.tar.gz |
tests/check_http.t: Fix whitespace issues
In tests/check_http.t, tabs are used for indentation.
While at it, apply another few cosmetic changes.
-rwxr-xr-x | plugins/tests/check_http.t | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/plugins/tests/check_http.t b/plugins/tests/check_http.t index 0eb3f05..9f97abd 100755 --- a/plugins/tests/check_http.t +++ b/plugins/tests/check_http.t | |||
@@ -12,7 +12,6 @@ | |||
12 | # Common Name (eg, YOUR name) []:Ton Voon | 12 | # Common Name (eg, YOUR name) []:Ton Voon |
13 | # Email Address []:tonvoon@mac.com | 13 | # Email Address []:tonvoon@mac.com |
14 | 14 | ||
15 | |||
16 | use strict; | 15 | use strict; |
17 | use Test::More; | 16 | use Test::More; |
18 | use NPTest; | 17 | use NPTest; |
@@ -160,9 +159,9 @@ sub run_server { | |||
160 | } | 159 | } |
161 | } | 160 | } |
162 | 161 | ||
163 | END { | 162 | END { |
164 | foreach my $pid (@pids) { | 163 | foreach my $pid (@pids) { |
165 | if ($pid) { print "Killing $pid\n"; kill "INT", $pid } | 164 | if ($pid) { print "Killing $pid\n"; kill "INT", $pid } |
166 | } | 165 | } |
167 | }; | 166 | }; |
168 | 167 | ||
@@ -179,7 +178,7 @@ run_common_tests( { command => "$command -p $port_http" } ); | |||
179 | SKIP: { | 178 | SKIP: { |
180 | skip "HTTP::Daemon::SSL not installed", $common_tests + $ssl_only_tests if ! exists $servers->{https}; | 179 | skip "HTTP::Daemon::SSL not installed", $common_tests + $ssl_only_tests if ! exists $servers->{https}; |
181 | run_common_tests( { command => "$command -p $port_https", ssl => 1 } ); | 180 | run_common_tests( { command => "$command -p $port_https", ssl => 1 } ); |
182 | 181 | ||
183 | $result = NPTest->testCmd( "$command -p $port_https -S -C 14" ); | 182 | $result = NPTest->testCmd( "$command -p $port_https -S -C 14" ); |
184 | is( $result->return_code, 0, "$command -p $port_https -S -C 14" ); | 183 | is( $result->return_code, 0, "$command -p $port_https -S -C 14" ); |
185 | is( $result->output, 'OK - Certificate \'Ton Voon\' will expire on 03/03/2019 21:41.', "output ok" ); | 184 | is( $result->output, 'OK - Certificate \'Ton Voon\' will expire on 03/03/2019 21:41.', "output ok" ); |
@@ -188,14 +187,14 @@ SKIP: { | |||
188 | is( $result->return_code, 1, "$command -p $port_https -S -C 14000" ); | 187 | is( $result->return_code, 1, "$command -p $port_https -S -C 14000" ); |
189 | like( $result->output, '/WARNING - Certificate \'Ton Voon\' expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" ); | 188 | like( $result->output, '/WARNING - Certificate \'Ton Voon\' expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" ); |
190 | 189 | ||
191 | $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" ); | ||
192 | is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" ); | ||
193 | like( $result->output, '/CRITICAL - Certificate \'Ton Voon\' expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" ); | ||
194 | |||
195 | # Expired cert tests | 190 | # Expired cert tests |
191 | $result = NPTest->testCmd( "$command -p $port_https -S -C 13960,14000" ); | ||
192 | is( $result->return_code, 2, "$command -p $port_https -S -C 13960,14000" ); | ||
193 | like( $result->output, '/CRITICAL - Certificate \'Ton Voon\' expires in \d+ day\(s\) \(03/03/2019 21:41\)./', "output ok" ); | ||
194 | |||
196 | $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" ); | 195 | $result = NPTest->testCmd( "$command -p $port_https_expired -S -C 7" ); |
197 | is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" ); | 196 | is( $result->return_code, 2, "$command -p $port_https_expired -S -C 7" ); |
198 | is( $result->output, | 197 | is( $result->output, |
199 | 'CRITICAL - Certificate \'Ton Voon\' expired on 03/05/2009 00:13.', | 198 | 'CRITICAL - Certificate \'Ton Voon\' expired on 03/05/2009 00:13.', |
200 | "output ok" ); | 199 | "output ok" ); |
201 | 200 | ||
@@ -406,4 +405,3 @@ sub run_common_tests { | |||
406 | isnt( $@, "alarm\n", $cmd ); | 405 | isnt( $@, "alarm\n", $cmd ); |
407 | 406 | ||
408 | } | 407 | } |
409 | |||