aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Ton Voon <tonvoon@users.sourceforge.net> 2006-10-26 21:32:08 +0000
committerGravatar Ton Voon <tonvoon@users.sourceforge.net> 2006-10-26 21:32:08 +0000
commit299c6bab02f4a2068a7ba8bdfefc6c155f7d7364 (patch)
tree891e38a1313b5ec1a2dade57e33c33749ea294c3
parent94a3cf91b3548388a9b278273ac596203a4a9e75 (diff)
downloadmonitoring-plugins-299c6bab02f4a2068a7ba8bdfefc6c155f7d7364.tar.gz
New test variables default to "none", so no changes required to tinderbox satelites
git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1530 f882894a-f735-0410-b71e-b25c423dba1c
-rw-r--r--NPTest.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/NPTest.pm b/NPTest.pm
index 432f3968..672cb99c 100644
--- a/NPTest.pm
+++ b/NPTest.pm
@@ -54,8 +54,8 @@ user. The user can accept the developer's default value or reply "none"
which will then be returned as "" for the test to skip if appropriate.
If a parameter needs to be entered and the test is run without a tty
-attached (such as a cronjob), this routine will die causing the test to
-fail.
+attached (such as a cronjob), the parameter will be assigned as if it
+was "none". Tests can check for the parameter and skip if not set.
Responses are stored in an external, file-based
cache so subsequent test runs will use these values. The user is able
@@ -346,7 +346,8 @@ sub getTestParameter
return $default;
}
- die "Need to manually enter test parameter $param" unless (-t STDERR);
+ # Set "none" if no terminal attached (eg, tinderbox build servers when new variables set)
+ return "" unless (-t STDERR);
my $userResponse = "";