diff options
author | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2014-01-28 02:35:09 -0500 |
---|---|---|
committer | Thomas Guyot-Sionnest <dermoth@aei.ca> | 2014-01-28 02:35:09 -0500 |
commit | c30be5877cf0756dbdc361f7049483bf737f9403 (patch) | |
tree | b9c47316f594ed53d150f818443fb6743ea91f40 | |
parent | f34f51a005408a95cd2b20d739f761106857ef7b (diff) | |
download | monitoring-plugins-c30be58.tar.gz |
Clarify check_mysql test prompts
Also default to "-u test -ptest" which are default MySQL accounts only
missing the prescribed privileges.
The database is no longer specified as it is not used.
If wanted is should be its own parameter/tests.
-rw-r--r-- | plugins/t/check_mysql.t | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t index d9716458..28cd4cd0 100644 --- a/plugins/t/check_mysql.t +++ b/plugins/t/check_mysql.t | |||
@@ -21,27 +21,29 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql"); | |||
21 | plan tests => 15; | 21 | plan tests => 15; |
22 | 22 | ||
23 | my $bad_login_output = '/Access denied for user /'; | 23 | my $bad_login_output = '/Access denied for user /'; |
24 | my $mysqlserver = getTestParameter( | 24 | my $mysqlserver = getTestParameter( |
25 | "NP_MYSQL_SERVER", | 25 | "NP_MYSQL_SERVER", |
26 | "A MySQL Server hostname or IP with no slaves setup" | 26 | "A MySQL Server hostname or IP with no slaves setup" |
27 | ); | 27 | ); |
28 | my $mysqlsocket = getTestParameter( | 28 | my $mysqlsocket = getTestParameter( |
29 | "NP_MYSQL_SOCKET", | 29 | "NP_MYSQL_SOCKET", |
30 | "A MySQL Server socket with no slaves setup" | 30 | "Full path to a MySQL Server socket with no slaves setup" |
31 | ); | 31 | ); |
32 | my $mysql_login_details = getTestParameter( | 32 | my $mysql_login_details = getTestParameter( |
33 | "MYSQL_LOGIN_DETAILS", | 33 | "MYSQL_LOGIN_DETAILS", |
34 | "Command line parameters to specify login access", | 34 | "Command line parameters to specify login access (requires " . |
35 | "-u user -ppw -d db", | 35 | "REPLICATION CLIENT privleges)", |
36 | "-u test -ptest", | ||
36 | ); | 37 | ); |
37 | my $with_slave = getTestParameter( | 38 | my $with_slave = getTestParameter( |
38 | "NP_MYSQL_WITH_SLAVE", | 39 | "NP_MYSQL_WITH_SLAVE", |
39 | "MySQL server with slaves setup" | 40 | "MySQL server with slaves setup" |
40 | ); | 41 | ); |
41 | my $with_slave_login = getTestParameter( | 42 | my $with_slave_login = getTestParameter( |
42 | "NP_MYSQL_WITH_SLAVE_LOGIN", | 43 | "NP_MYSQL_WITH_SLAVE_LOGIN", |
43 | "Login details for server with slave", | 44 | "Login details for server with slave (requires REPLICATION CLIENT " . |
44 | "-uroot -ppw" | 45 | "privleges)", |
46 | $mysql_login_details || "-u test -ptest" | ||
45 | ); | 47 | ); |
46 | 48 | ||
47 | my $result; | 49 | my $result; |