2 files changed, 30 insertions, 37 deletions

diff --git a/plugins/t/check_mysql.t b/plugins/t/check_mysql.t
index baf3acc6..a383bc99 100644
--- a/plugins/t/check_mysql.t
+++ b/plugins/t/check_mysql.t
@@ -21,11 +21,11 @@ plan skip_all => "check_mysql not compiled" unless (-x "check_mysql");
 plan tests => 15;
 
 my $bad_login_output = '/Access denied for user /';
-my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no slaves setup");
-my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no slaves setup");
+my $mysqlserver         = getTestParameter("NP_MYSQL_SERVER", "A MySQL Server hostname or IP with no replica setup");
+my $mysqlsocket         = getTestParameter("NP_MYSQL_SOCKET", "Full path to a MySQL Server socket with no replica setup");
 my $mysql_login_details = getTestParameter("NP_MYSQL_LOGIN_DETAILS", "Command line parameters to specify login access (requires REPLICATION CLIENT privileges)", "-u test -ptest");
-my $with_slave          = getTestParameter("NP_MYSQL_WITH_SLAVE", "MySQL server with slaves setup");
-my $with_slave_login    = getTestParameter("NP_MYSQL_WITH_SLAVE_LOGIN", "Login details for server with slave (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
+my $with_replica          = getTestParameter("NP_MYSQL_WITH_REPLICA", "MySQL server with replica setup");
+my $with_replica_login    = getTestParameter("NP_MYSQL_WITH_REPLICA_LOGIN", "Login details for server with replica (requires REPLICATION CLIENT privileges)", $mysql_login_details || "-u test -ptest");
 
 my $result;
 
@@ -39,8 +39,8 @@ SKIP: {
         like( $result->output, $bad_login_output, "Expected login failure message");
 
         $result = NPTest->testCmd("./check_mysql -S -H $mysqlserver $mysql_login_details");
-        cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-        like( $result->output, "/No slaves defined/", "Correct error message");
+        cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+        like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
@@ -53,22 +53,22 @@ SKIP: {
         like( $result->output, $bad_login_output, "Expected login failure message");
 
         $result = NPTest->testCmd("./check_mysql -S -s $mysqlsocket $mysql_login_details");
-        cmp_ok( $result->return_code, "==", 1, "No slaves defined" );
-        like( $result->output, "/No slaves defined/", "Correct error message");
+        cmp_ok( $result->return_code, "==", 1, "No replicas defined" );
+        like( $result->output, "/No replicas defined/", "Correct error message");
 }
 
 SKIP: {
-        skip "No mysql server with slaves defined", 5 unless $with_slave;
-        $result = NPTest->testCmd("./check_mysql -H $with_slave $with_slave_login");
+        skip "No mysql server with replicas defined", 5 unless $with_replica;
+        $result = NPTest->testCmd("./check_mysql -H $with_replica $with_replica_login");
         cmp_ok( $result->return_code, '==', 0, "Login okay");
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login");
-        cmp_ok( $result->return_code, "==", 0, "Slaves okay" );
+        $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login");
+        cmp_ok( $result->return_code, "==", 0, "Replicas okay" );
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60");
-        cmp_ok( $result->return_code, '==', 0, 'Slaves are not > 60 seconds behind');
+        $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60");
+        cmp_ok( $result->return_code, '==', 0, 'Replicas are not > 60 seconds behind');
 
-        $result = NPTest->testCmd("./check_mysql -S -H $with_slave $with_slave_login -w 60:");
+        $result = NPTest->testCmd("./check_mysql -S -H $with_replica $with_replica_login -w 60:");
         cmp_ok( $result->return_code, '==', 1, 'Alert warning if < 60 seconds behind');
-        like( $result->output, "/^SLOW_SLAVE WARNING:/", "Output okay");
+        like( $result->output, "/^SLOW_REPLICA WARNING:/", "Output okay");
 }
diff --git a/plugins/t/check_swap.t b/plugins/t/check_swap.t
index 7e61b766..68946f6d 100644
--- a/plugins/t/check_swap.t
+++ b/plugins/t/check_swap.t
@@ -17,42 +17,35 @@ my $message = '/^[0-9]+\% free \([0-9]+MiB out of [0-9]+MiB\)/';
 
 $result = NPTest->testCmd( "./check_swap $outputFormat" );                                      # Always OK
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "OK", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -w 1048576 -c 1048576 $outputFormat" );                # 1 MB free
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "OK", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -w 1% -c 1% $outputFormat" );                  # 1% free
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "OK", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "OK", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -w 100% -c 100% $outputFormat" );                      # 100% (always critical)
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "CRITICAL", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "CRITICAL", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -w 100% -c 1% $outputFormat" );                        # 100% (always warn)
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "WARNING", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "WARNING", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -w 100% $outputFormat" );                              # 100% (single threshold, always warn)
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "WARNING", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "WARNING", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");
 
 $result = NPTest->testCmd( "./check_swap -c 100% $outputFormat" );                              # 100% (single threshold, always critical)
 cmp_ok( $result->return_code, "==", 0, "Always OK" );
-$output = decode_json($result->output);
-is($output->{'state'}, "CRITICAL", "State was correct");
-like($output->{'checks'}->[0]->{'output'}, $message, "Output was correct");
+is($result->{'mp_test_result'}->{'state'}, "CRITICAL", "State was correct");
+like($result->{'mp_test_result'}->{'checks'}->[0]->{'output'}, $message, "Output was correct");