From f80cde2af149fda9c47d8f9131f82527b76af487 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Thu, 17 Aug 2017 23:47:46 +0300 Subject: [PATCH] Fix bug519 The test attempted to copy the generated CSV file from the MaxScale server when in fact it was on the master server. Removed HEAVY label from the test as it takes about 10 seconds to run. --- maxscale-system-test/CMakeLists.txt | 2 +- maxscale-system-test/bug519.cpp | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/maxscale-system-test/CMakeLists.txt b/maxscale-system-test/CMakeLists.txt index 796228737..615a919a9 100644 --- a/maxscale-system-test/CMakeLists.txt +++ b/maxscale-system-test/CMakeLists.txt @@ -109,7 +109,7 @@ add_test_executable(bug507.cpp bug507 replication LABELS readwritesplit LIGHT RE add_test_executable(bug509.cpp bug509 galera LABELS readwritesplit GALERA_BACKEND) # Checks "SELECT * INTO OUTFILE" and "LOAD DATA LOCAL INFILE" -add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit HEAVY REPL_BACKEND) +add_test_executable(bug519.cpp bug519 replication LABELS readwritesplit REPL_BACKEND) # Regression case for the bug "'Current no. of conns' not going down" add_test_executable(bug529.cpp bug529 replication LABELS readwritesplit readconnroute maxscale REPL_BACKEND) diff --git a/maxscale-system-test/bug519.cpp b/maxscale-system-test/bug519.cpp index 9cfb474bb..79b4c34da 100644 --- a/maxscale-system-test/bug519.cpp +++ b/maxscale-system-test/bug519.cpp @@ -106,12 +106,7 @@ int main(int argc, char *argv[]) Test->try_query(Test->conn_slave, (char *) "SELECT * INTO OUTFILE '/tmp/t3.csv' FROM t1;"); Test->tprintf("Copying t1.cvs from Maxscale machine:\n"); - Test->copy_from_maxscale((char *) "/tmp/t1.csv", (char *) "./"); - /*sprintf(str, - "scp -i %s -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=quiet %s@%s:/tmp/t1.csv ./", - Test->repl->sshkey[0], Test->repl->access_user[0], Test->repl->IP[0]); - Test->tprintf("%s\n", str); - system(str);*/ + Test->repl->copy_from_node("/tmp/t1.csv", "./t1.csv", 0); MYSQL *srv[2];