hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '2.1' into 2.2

Browse Source
This commit is contained in:
Markus Mäkelä
2018-01-30 16:28:11 +02:00
parent 6410b4f19a 6dcc71d862
commit 3dfb972d87
21 changed files with 550 additions and 197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
maxscale-system-test/check_backend.cpp
View File

@ -8,11 +8,14 @@
int main(int argc, char *argv[])
{
int exit_code;
TestConnections * Test = new TestConnections(argc, argv);
/*Test->maxscales->restart_maxscale(0);
sleep(5);*/
std::string src = std::string(test_dir) + "/mdbci/add_core_cnf.sh";
Test->maxscales->copy_to_node(0, src.c_str(), Test->maxscales->access_homedir[0]);
Test->maxscales->ssh_node_f(0, true, "%s/add_core_cnf.sh %s", Test->maxscales->access_homedir[0],
Test->verbose ? "verbose" : "");
Test->set_timeout(10);
Test->tprintf("Connecting to Maxscale maxscales->routers[0] with Master/Slave backend\n");
@ -40,6 +43,7 @@ int main(int argc, char *argv[])
Test->maxscales->close_maxscale_connections(0);
Test->check_maxscale_alive(0);
int exit_code = 0;
char * ver = Test->maxscales->ssh_node_output(0, "maxscale --version-full", false, &exit_code);
Test->tprintf("Maxscale_full_version_start:\n%s\nMaxscale_full_version_end\n", ver);