From 22d47aab52fb16c10d335805bc7ba7e94ddf7b18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 6 Jul 2017 13:31:38 +0300 Subject: [PATCH] Print the JSON in avro_alter The test now prints the output in avro_alter. The replicate_from_master function also stops maxscale before removing the files. --- maxscale-system-test/avro_alter.cpp | 1 + maxscale-system-test/testconnections.cpp | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/maxscale-system-test/avro_alter.cpp b/maxscale-system-test/avro_alter.cpp index ab6b51ebc..3fdf0146b 100644 --- a/maxscale-system-test/avro_alter.cpp +++ b/maxscale-system-test/avro_alter.cpp @@ -55,6 +55,7 @@ int main(int argc, char *argv[]) { json_error_t err; json_t* json = json_loads(line.c_str(), 0, &err); + test.tprintf("%s", line.c_str()); test.add_result(json == NULL, "Failed to parse JSON: %s", line.c_str()); json_decref(json); nrows++; diff --git a/maxscale-system-test/testconnections.cpp b/maxscale-system-test/testconnections.cpp index 548dffde7..dbfa117a2 100644 --- a/maxscale-system-test/testconnections.cpp +++ b/maxscale-system-test/testconnections.cpp @@ -967,8 +967,9 @@ bool TestConnections::replicate_from_master() mysql_close(conn); /** Clean up MaxScale directories */ + ssh_maxscale(true, "service maxscale stop"); prepare_binlog(); - ssh_maxscale(true, "service maxscale restart"); + ssh_maxscale(true, "service maxscale start"); char log_file[256] = ""; char log_pos[256] = "4";