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

Merge branch '2.2' into develop

Browse Source
This commit is contained in:
Markus Mäkelä
2018-08-30 11:36:58 +03:00
parent 9c3dc76fa9 4c5e18b4f0
commit a13e95951b
47 changed files with 323 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
maxscale-system-test/mxs1542.cpp
View File

@ -23,11 +23,11 @@ int main(int argc, char** argv)
// Wait for the data to be processed
const char* logmsg = "Waiting until more data is written";
test.maxscales->ssh_node_f(0, true,
"for ((i=0;i<15;i++)); do grep '%s' /var/log/maxscale/maxscale.log && break || sleep 1; done", logmsg);
"for ((i=0;i<15;i++)); do grep '%s' /var/log/maxscale/maxscale.log && break || sleep 1; done", logmsg);
// Check if the Avro file contains the inserted value
int rc = test.maxscales->ssh_node_f(0, true,
"maxavrocheck -d /var/lib/maxscale/avro/test.t1.000001.avro|grep 'Hello World'");
"maxavrocheck -d /var/lib/maxscale/avro/test.t1.000001.avro|grep 'Hello World'");
test.add_result(rc == 0, "Data is converted when a failure to convert is expected");
printf("\n"