diff options
| author | abrist <abrist@nagios.com> | 2014-03-03 12:42:33 -0500 |
|---|---|---|
| committer | Jan Wagner <waja@cyconet.org> | 2014-06-30 13:55:42 +0200 |
| commit | 4277f47bffb65bafeb9b8e256dd7116ce747e850 (patch) | |
| tree | c7fda9c0657cf834152567f82cdd7bcf4301ee23 /plugins | |
| parent | b5d78f9556f6da877afaa763f281e7495d572367 (diff) | |
| download | monitoring-plugins-4277f47bffb65bafeb9b8e256dd7116ce747e850.tar.gz | |
check_jabber.t - fixed tests for new status output including hostname
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/t/check_jabber.t | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/t/check_jabber.t b/plugins/t/check_jabber.t index 1aaf8125..7a708d5b 100644 --- a/plugins/t/check_jabber.t +++ b/plugins/t/check_jabber.t | |||
| @@ -29,7 +29,7 @@ my $hostname_invalid = getTestParameter( | |||
| 29 | ); | 29 | ); |
| 30 | 30 | ||
| 31 | 31 | ||
| 32 | my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on port 5222/'; | 32 | my $jabberOK = '/JABBER OK\s-\s\d+\.\d+\ssecond response time on '.$host_tcp_jabber.' port 5222/'; |
| 33 | 33 | ||
| 34 | my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/'; | 34 | my $jabberUnresponsive = '/CRITICAL\s-\sSocket timeout after\s\d+\sseconds/'; |
| 35 | 35 | ||
| @@ -40,7 +40,7 @@ my $r; | |||
| 40 | SKIP: { | 40 | SKIP: { |
| 41 | skip "No jabber server defined", 6 unless $host_tcp_jabber; | 41 | skip "No jabber server defined", 6 unless $host_tcp_jabber; |
| 42 | 42 | ||
| 43 | $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber" ); | 43 | $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber" ); |
| 44 | is( $r->return_code, 0, "Connected okay"); | 44 | is( $r->return_code, 0, "Connected okay"); |
| 45 | like( $r->output, $jabberOK, "Output as expected" ); | 45 | like( $r->output, $jabberOK, "Output as expected" ); |
| 46 | 46 | ||
| @@ -48,7 +48,7 @@ SKIP: { | |||
| 48 | is( $r->return_code, 0, "Connected okay, within limits" ); | 48 | is( $r->return_code, 0, "Connected okay, within limits" ); |
| 49 | like( $r->output, $jabberOK, "Output as expected" ); | 49 | like( $r->output, $jabberOK, "Output as expected" ); |
| 50 | 50 | ||
| 51 | $r = NPTest->testCmd( "./check_jabber $host_tcp_jabber -wt 9 -ct 9 -to 10" ); | 51 | $r = NPTest->testCmd( "./check_jabber -H $host_tcp_jabber -wt 9 -ct 9 -to 10" ); |
| 52 | is( $r->return_code, 0, "Old syntax okay" ); | 52 | is( $r->return_code, 0, "Old syntax okay" ); |
| 53 | like( $r->output, $jabberOK, "Output as expected" ); | 53 | like( $r->output, $jabberOK, "Output as expected" ); |
| 54 | 54 | ||