Oops - forgot to remove the SKIP block (which didn't seem to work fine)

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

1 files changed, 91 insertions, 95 deletions

diff --git a/plugins/t/check_by_ssh.t b/plugins/t/check_by_ssh.t
index 34b749f7..8bdb6567 100644
--- a/plugins/t/check_by_ssh.t
+++ b/plugins/t/check_by_ssh.t
@@ -34,102 +34,98 @@ for (@responce) {
 	push(@check, "echo $_");
 }
 
-#SKIP {
-#	skip "SSH_HOST and SSH_IDENTITY must be defined", 36 unless($ssh_service && $ssh_key);
-
-	my $result;
-	
-	## Single active checks
-	
-	for (my $i=0; $i<4; $i++) {
-		$result = NPTest->testCmd(
-			"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[$i]; exit $i'"
-			);
-		cmp_ok($result->return_code, '==', $i, "Exit with return code $i");
-		is($result->output, $responce[$i], "Status text is correct for check $i");
-	}
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 0'"
-		);
-	cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
-	is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 1'"
-		);
-	cmp_ok($result->return_code, '==', 1, "Exit with return code 1 (WARNING)");
-	is($result->output, 'WARNING - check_by_ssh: Remote command \'exit 1\' returned status 1', "Status text if command returned none (WARNING)");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 2'"
-		);
-	cmp_ok($result->return_code, '==', 2, "Exit with return code 2 (CRITICAL)");
-	is($result->output, 'CRITICAL - check_by_ssh: Remote command \'exit 2\' returned status 2', "Status text if command returned none (CRITICAL)");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 3'"
-		);
-	cmp_ok($result->return_code, '==', 3, "Exit with return code 3 (UNKNOWN)");
-	is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 3\' returned status 3', "Status text if command returned none (UNKNOWN)");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 7'"
-		);
-	cmp_ok($result->return_code, '==', 7, "Exit with return code 7 (out of bounds)");
-	is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 7\' returned status 7', "Status text if command returned none (out of bounds)");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[4]; exit 8'"
-		);
-	cmp_ok($result->return_code, '==', 8, "Exit with return code 8 (out of bounds)");
-	is($result->output, $responce[4], "Return proper status text even with unknown status codes");
-	
-	# Multiple active checks
+my $result;
+
+## Single active checks
+
+for (my $i=0; $i<4; $i++) {
 	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[1]; sh -c exit\\ 1'  -C '$check[0]; sh -c exit\\ 0' -C '$check[3]; sh -c exit\\ 3' -C '$check[2]; sh -c exit\\ 2'"
+		"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[$i]; exit $i'"
 		);
-	cmp_ok($result->return_code, '==', 0, "Multiple checks always return OK");
-	my @lines = split(/\n/, $result->output);
-	my %linemap = (
-	               '0' => '1',
-	               '2' => '0',
-	               '4' => '3',
-	               '6' => '2',
+	cmp_ok($result->return_code, '==', $i, "Exit with return code $i");
+	is($result->output, $responce[$i], "Status text is correct for check $i");
+}
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 0'"
 	);
-	foreach my $line (0, 2, 4, 6) {
-		my $code = $linemap{$line};
-		my $statline = $line+1;
-		is($lines[$line], "$responce[$code]", "multiple checks status text is correct for line $line");
-		is($lines[$statline], "STATUS CODE: $code", "multiple check status code is correct for line $line");
-	}
-	
-	# Passive checks
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -n flint -s serv -C '$check[2]; sh -c exit\\ 2' -O /tmp/check_by_ssh.$$"
-		);
-	cmp_ok($result->return_code, '==', 0, "Exit always ok on passive checks");
-	open(PASV, "/tmp/check_by_ssh.$$") or die("Unable to open '/tmp/check_by_ssh.$$': $!");
-	my $count=0;
-	while (<PASV>) {
-		like($_, '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;serv;2;$responce[2]$/', 'proper result for passive check');
-		$count++;
-	}
-	cmp_ok($count, '==', 1, 'One passive result for one check performed');
-	unlink("/tmp/check_by_ssh.$$") or die("Unable to unlink '/tmp/check_by_ssh.$$': $!");
-	
-	$result = NPTest->testCmd(
-		"./check_by_ssh -i $ssh_key -H $ssh_service -n flint -s c0:c1:c2:c3:c4 -C '$check[0], exit 0' -C '$check[1]; exit 1' -C '$check[2]; exit 2' -C '$check[3]; exit 3' -C '$check[4]; exit 9' -O /tmp/check_by_ssh.$$"
-		);
-	cmp_ok($result->return_code, '==', 0, "Exit always ok on passive checks");
-	$count=0;
-	open(PASV, "/tmp/check_by_ssh.$$") or die("Unable to open '/tmp/check_by_ssh.$$': $!");
-	while (<PASV>) {
-		my $ret;
-		($count == 4 ? $ret = 7 : $ret = $count);
-		like($_, '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;c' . $count . ';' . $ret . ';' . $responce[$count] . '$/', "proper result for passive check $count");
-	}
-	cmp_ok($count, '==', 5, 'Five passive result for five checks performed');
-	unlink("/tmp/check_by_ssh.$$") or die("Unable to unlink '/tmp/check_by_ssh.$$': $!");
-#}
+cmp_ok($result->return_code, '==', 0, "Exit with return code 0 (OK)");
+is($result->output, 'OK - check_by_ssh: Remote command \'exit 0\' returned status 0', "Status text if command returned none (OK)");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 1'"
+	);
+cmp_ok($result->return_code, '==', 1, "Exit with return code 1 (WARNING)");
+is($result->output, 'WARNING - check_by_ssh: Remote command \'exit 1\' returned status 1', "Status text if command returned none (WARNING)");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 2'"
+	);
+cmp_ok($result->return_code, '==', 2, "Exit with return code 2 (CRITICAL)");
+is($result->output, 'CRITICAL - check_by_ssh: Remote command \'exit 2\' returned status 2', "Status text if command returned none (CRITICAL)");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 3'"
+	);
+cmp_ok($result->return_code, '==', 3, "Exit with return code 3 (UNKNOWN)");
+is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 3\' returned status 3', "Status text if command returned none (UNKNOWN)");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C 'exit 7'"
+	);
+cmp_ok($result->return_code, '==', 7, "Exit with return code 7 (out of bounds)");
+is($result->output, 'UNKNOWN - check_by_ssh: Remote command \'exit 7\' returned status 7', "Status text if command returned none (out of bounds)");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[4]; exit 8'"
+	);
+cmp_ok($result->return_code, '==', 8, "Exit with return code 8 (out of bounds)");
+is($result->output, $responce[4], "Return proper status text even with unknown status codes");
+
+# Multiple active checks
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -C '$check[1]; sh -c exit\\ 1'  -C '$check[0]; sh -c exit\\ 0' -C '$check[3]; sh -c exit\\ 3' -C '$check[2]; sh -c exit\\ 2'"
+	);
+cmp_ok($result->return_code, '==', 0, "Multiple checks always return OK");
+my @lines = split(/\n/, $result->output);
+my %linemap = (
+               '0' => '1',
+               '2' => '0',
+               '4' => '3',
+               '6' => '2',
+);
+foreach my $line (0, 2, 4, 6) {
+	my $code = $linemap{$line};
+	my $statline = $line+1;
+	is($lines[$line], "$responce[$code]", "multiple checks status text is correct for line $line");
+	is($lines[$statline], "STATUS CODE: $code", "multiple check status code is correct for line $line");
+}
+
+# Passive checks
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -n flint -s serv -C '$check[2]; sh -c exit\\ 2' -O /tmp/check_by_ssh.$$"
+	);
+cmp_ok($result->return_code, '==', 0, "Exit always ok on passive checks");
+open(PASV, "/tmp/check_by_ssh.$$") or die("Unable to open '/tmp/check_by_ssh.$$': $!");
+my $count=0;
+while (<PASV>) {
+	like($_, '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;serv;2;$responce[2]$/', 'proper result for passive check');
+	$count++;
+}
+cmp_ok($count, '==', 1, 'One passive result for one check performed');
+unlink("/tmp/check_by_ssh.$$") or die("Unable to unlink '/tmp/check_by_ssh.$$': $!");
+
+$result = NPTest->testCmd(
+	"./check_by_ssh -i $ssh_key -H $ssh_service -n flint -s c0:c1:c2:c3:c4 -C '$check[0], exit 0' -C '$check[1]; exit 1' -C '$check[2]; exit 2' -C '$check[3]; exit 3' -C '$check[4]; exit 9' -O /tmp/check_by_ssh.$$"
+	);
+cmp_ok($result->return_code, '==', 0, "Exit always ok on passive checks");
+$count=0;
+open(PASV, "/tmp/check_by_ssh.$$") or die("Unable to open '/tmp/check_by_ssh.$$': $!");
+while (<PASV>) {
+	my $ret;
+	($count == 4 ? $ret = 7 : $ret = $count);
+	like($_, '/^\[\d+\] PROCESS_SERVICE_CHECK_RESULT;flint;c' . $count . ';' . $ret . ';' . $responce[$count] . '$/', "proper result for passive check $count");
+}
+cmp_ok($count, '==', 5, 'Five passive result for five checks performed');
+unlink("/tmp/check_by_ssh.$$") or die("Unable to unlink '/tmp/check_by_ssh.$$': $!");