3 files changed, 15 insertions, 9 deletions

diff --git a/plugins-scripts/t/check_ifoperstatus.t b/plugins-scripts/t/check_ifoperstatus.t
index 1d6114f6..2feb3646 100644
--- a/plugins-scripts/t/check_ifoperstatus.t
+++ b/plugins-scripts/t/check_ifoperstatus.t
@@ -19,7 +19,7 @@ SKIP: {
         my $host_snmp = getTestParameter( "NP_HOST_SNMP", "A host providing an SNMP Service", "localhost");
 
         my $snmp_community = getTestParameter( "NP_SNMP_COMMUNITY",
-                                               "The SNMP Community string for SNMP Testing (pick default rather than 'none' when no snmp host is available)",
+                                               "The SNMP Community string for SNMP Testing",
                                                "public");
 
         my ($snmp_interface, $snmp_ifxtable);
@@ -75,15 +75,17 @@ SKIP: {
 
         }
 
+        # These checks need a complete command line. An invalid community is used so
+        # the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway
         SKIP: {
                 skip "no non responsive host defined", 1 if ( ! $host_nonresponsive );
-                $res = NPTest->testCmd( "./$plugin -H $host_nonresponsive -C $snmp_community -k 1");
+                $res = NPTest->testCmd( "./$plugin -H $host_nonresponsive -C np_foobar -k 1");
                 cmp_ok( $res->return_code, '==', 1, "Exit WARNING with non responsive host" ); 
         }
 
         SKIP: {
                 skip "no invalid host defined", 2 if ( ! $hostname_invalid );
-                $res = NPTest->testCmd( "./$plugin -H $hostname_invalid -C $snmp_community -k 1");
+                $res = NPTest->testCmd( "./$plugin -H $hostname_invalid -C np_foobar -k 1");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with invalid host" ); 
                 like($res->output, "/Unable to resolve.*$hostname_invalid/", "String matches unable to resolve.*$hostname_invalid");
         }
diff --git a/plugins-scripts/t/check_ifstatus.t b/plugins-scripts/t/check_ifstatus.t
index fc7052a6..7d0220a4 100644
--- a/plugins-scripts/t/check_ifstatus.t
+++ b/plugins-scripts/t/check_ifstatus.t
@@ -19,7 +19,7 @@ SKIP: {
         my $host_snmp = getTestParameter( "NP_HOST_SNMP", "A host providing an SNMP Service", "localhost");
 
         my $snmp_community = getTestParameter( "NP_SNMP_COMMUNITY",
-                                               "The SNMP Community string for SNMP Testing (pick default rather than 'none' when no snmp host is available)",
+                                               "The SNMP Community string for SNMP Testing",
                                                "public");
 
         my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
@@ -49,15 +49,17 @@ SKIP: {
 
         }
 
+        # These checks need a complete command line. An invalid community is used so
+        # the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway
         SKIP: {
                 skip "no non responsive host defined", 1 if ( ! $host_nonresponsive );
-                $res = NPTest->testCmd( "./$plugin -H $host_nonresponsive -C $snmp_community");
+                $res = NPTest->testCmd( "./$plugin -H $host_nonresponsive -C np_foobar");
                 cmp_ok( $res->return_code, '==', 2, "Exit CRITICAL with non responsive host" ); 
         }
 
         SKIP: {
                 skip "no invalid host defined", 2 if ( ! $hostname_invalid );
-                $res = NPTest->testCmd( "./$plugin -H $hostname_invalid -C $snmp_community");
+                $res = NPTest->testCmd( "./$plugin -H $hostname_invalid -C np_foobar");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with invalid host" ); 
                 like($res->output, "/Unable to resolve.*$hostname_invalid/", "String matches unable to resolve.*$hostname_invalid");
         }
diff --git a/plugins/t/check_snmp.t b/plugins/t/check_snmp.t
index 6cc97b6e..cda12f47 100644
--- a/plugins/t/check_snmp.t
+++ b/plugins/t/check_snmp.t
@@ -44,7 +44,7 @@ SKIP: {
         like( $res->output, "/check_snmp: Invalid SNMP version - 3c/" );
 
         SKIP: {
-                skip "no snmp host defined", 30 if ( ! $host_snmp );
+                skip "no snmp host defined", 32 if ( ! $host_snmp );
 
                 $res = NPTest->testCmd( "./check_snmp -H $host_snmp -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 0, "Exit OK when querying uptime" ); 
@@ -114,16 +114,18 @@ SKIP: {
 
         }
 
+        # These checks need a complete command line. An invalid community is used so
+        # the tests can run on hosts w/o snmp host/community in NPTest.cache. Execution will fail anyway
         SKIP: {
                 skip "no non responsive host defined", 2 if ( ! $host_nonresponsive );
-                $res = NPTest->testCmd( "./check_snmp -H $host_nonresponsive -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
+                $res = NPTest->testCmd( "./check_snmp -H $host_nonresponsive -C np_foobar -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" ); 
                 like($res->output, '/External command error: Timeout: No Response from /', "String matches timeout problem");
         }
 
         SKIP: {
                 skip "no non invalid host defined", 2 if ( ! $hostname_invalid );
-                $res = NPTest->testCmd( "./check_snmp -H $hostname_invalid   -C $snmp_community -o system.sysUpTime.0 -w 1: -c 1:");
+                $res = NPTest->testCmd( "./check_snmp -H $hostname_invalid   -C np_foobar -o system.sysUpTime.0 -w 1: -c 1:");
                 cmp_ok( $res->return_code, '==', 3, "Exit UNKNOWN with non responsive host" ); 
                 like($res->output, '/External command error: .*(nosuchhost|Name or service not known|Unknown host)/', "String matches invalid host");
         }