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

Reduce test verbosity

Browse Source 
When a test is checking the status of the nodes, the output is relatively
verbose.

Also changed dropping of users to use the IF EXISTS syntax. This will
remove the errors if the users do not exist.
This commit is contained in:
Markus Mäkelä
2018-06-30 19:23:57 +03:00
parent ceb1c0f2a4
commit a1ab09a79f
3 changed files with 26 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
maxscale-system-test/nodes.cpp
View File

@ -1,6 +1,7 @@
#include "nodes.h"
#include <string>
#include <cstring>
#include <iostream>
Nodes::Nodes()
{
@ -9,8 +10,6 @@ Nodes::Nodes()
int Nodes::check_node_ssh(int node)
{
int res = 0;
printf("Checking node %d\n", node);
fflush(stdout);
if (ssh_node(node, (char *) "ls > /dev/null", false) != 0)
{
@ -20,7 +19,6 @@ int Nodes::check_node_ssh(int node)
}
else
{
printf("Node %d is OK\n", node);
fflush(stdout);
}
return res;
@ -28,12 +26,17 @@ int Nodes::check_node_ssh(int node)
int Nodes::check_nodes()
{
int res = 0;
std::cout << "Checking nodes..." << std::endl;
for (int i = 0; i < N; i++)
{
res += check_node_ssh(i);
if (check_node_ssh(i) != 0)
{
return 1;
}
}
return res;
return 0;
}
void Nodes::generate_ssh_cmd(char *cmd, int node, const char *ssh, bool sudo)