diff options
author | Sven Nierlein <Sven.Nierlein@consol.de> | 2018-12-04 14:20:18 (GMT) |
---|---|---|
committer | Sven Nierlein <Sven.Nierlein@consol.de> | 2018-12-04 14:20:19 (GMT) |
commit | d7dcca22ae2f7bdf0ee2282e00c1999de0b58e26 (patch) | |
tree | 56c6268f2a2481ff7b866ccd09c2005d7ec24a67 /plugins/t/check_mysql_query.t | |
parent | b69eb5afed40f14ba648c3358e2b46aeb75b0c5d (diff) | |
download | monitoring-plugins-d7dcca22ae2f7bdf0ee2282e00c1999de0b58e26.tar.gz |
tests: rework test parametersrefs/pull/1565/head
there were 2 variants of calling getTestParameter:
- parameter, description, default value
- parameter, env value, default value, description, scope
While scope was never actually used and having 2 names for the same value led
to having 2 different entries in the cache file for the same configuration.
This commit removes the variants and simplifies tests parameters by only using
the first 3 parameter variant.
Diffstat (limited to 'plugins/t/check_mysql_query.t')
-rw-r--r-- | plugins/t/check_mysql_query.t | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/plugins/t/check_mysql_query.t b/plugins/t/check_mysql_query.t index 407af88..96899ac 100644 --- a/plugins/t/check_mysql_query.t +++ b/plugins/t/check_mysql_query.t | |||
@@ -17,15 +17,8 @@ use vars qw($tests); | |||
17 | 17 | ||
18 | plan skip_all => "check_mysql_query not compiled" unless (-x "check_mysql_query"); | 18 | plan skip_all => "check_mysql_query not compiled" unless (-x "check_mysql_query"); |
19 | 19 | ||
20 | my $mysqlserver = getTestParameter( | 20 | my $mysqlserver = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server with no slaves setup"); |
21 | "NP_MYSQL_SERVER", | 21 | my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access", "-u user -ppw -d db"); |
22 | "A MySQL Server with no slaves setup" | ||
23 | ); | ||
24 | my $mysql_login_details = getTestParameter( | ||
25 | "MYSQL_LOGIN_DETAILS", | ||
26 | "Command line parameters to specify login access", | ||
27 | "-u user -ppw -d db", | ||
28 | ); | ||
29 | my $result; | 22 | my $result; |
30 | 23 | ||
31 | if (! $mysqlserver) { | 24 | if (! $mysqlserver) { |