1 files changed, 35 insertions, 20 deletions

diff --git a/plugins-root/t/check_dhcp.t b/plugins-root/t/check_dhcp.t
index 1f7c518c..a7ce1e20 100644
--- a/plugins-root/t/check_dhcp.t
+++ b/plugins-root/t/check_dhcp.t
@@ -8,42 +8,57 @@ use Test::More;
 use NPTest;
 
 my $allow_sudo = getTestParameter( "NP_ALLOW_SUDO",
-        "If sudo is setup for this user to run any command as root ('yes' to allow)",
-        "no" );
+                                   "If sudo is setup for this user to run any command as root ('yes' to allow)",
+                                   "no" );
 
 if ($allow_sudo eq "yes" or $> == 0) {
-        plan tests => 4;
+    plan tests => 6;
 } else {
-        plan skip_all => "Need sudo to test check_dhcp";
+    plan skip_all => "Need sudo to test check_dhcp";
 }
 my $sudo = $> == 0 ? '' : 'sudo';
 
 my $successOutput = '/OK: Received \d+ DHCPOFFER\(s\), \d+ of 1 requested servers responded, max lease time = \d+ sec\./';
 my $failureOutput = '/CRITICAL: Received \d+ DHCPOFFER\(s\), 0 of \d+ requested servers responded/';
+my $invalidOutput = '/Invalid hostname/';
 
 my $host_responsive    = getTestParameter( "NP_HOST_DHCP_RESPONSIVE",
-                                "The hostname of system responsive to dhcp requests",
-                                "localhost" );
+                                           "The hostname of system responsive to dhcp requests",
+                                           "localhost" );
 
 my $host_nonresponsive = getTestParameter( "NP_HOST_NONRESPONSIVE",
-                                "The hostname of system not responsive to dhcp requests",
-                                "10.0.0.1" );
+                                           "The hostname of system not responsive to dhcp requests",
+                                           "10.0.0.1" );
 
 my $hostname_invalid   = getTestParameter( "NP_HOSTNAME_INVALID",
-                                "An invalid (not known to DNS) hostname",
-                                "nosuchhost" );
+                                           "An invalid (not known to DNS) hostname",
+                                           "nosuchhost" );
 
 my $res;
 
-$res = NPTest->testCmd(
-        "$sudo ./check_dhcp -s $host_responsive"
-        );
-is( $res->return_code, 0, "Syntax ok" );
-like( $res->output, $successOutput, "Output OK" );
+SKIP: {
+    skip('need responsive test host', 2) unless $host_responsive;
+    $res = NPTest->testCmd(
+        "$sudo ./check_dhcp -s $host_responsive"
+    );
+    is( $res->return_code, 0, "Syntax ok" );
+    like( $res->output, $successOutput, "Output OK" );
+};
 
-$res = NPTest->testCmd(
-        "$sudo ./check_dhcp -s $host_nonresponsive"
-        );
-is( $res->return_code, 2, "Timeout - host nonresponsive" );
-like( $res->output, $failureOutput, "Output OK" );
+SKIP: {
+    skip('need nonresponsive test host', 2) unless $host_nonresponsive;
+    $res = NPTest->testCmd(
+        "$sudo ./check_dhcp -s $host_nonresponsive"
+    );
+    is( $res->return_code, 2, "Exit code - host nonresponsive" );
+    like( $res->output, $failureOutput, "Output OK" );
+};
 
+SKIP: {
+    skip('need invalid test host', 2) unless $hostname_invalid;
+    $res = NPTest->testCmd(
+        "$sudo ./check_dhcp -s $hostname_invalid"
+    );
+    is( $res->return_code, 3, "Exit code - host invalid" );
+    like( $res->output, $invalidOutput, "Output OK" );
+};