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

refactored tests (#147)

Browse Source
This commit is contained in:
Timofey Turenko
2017-12-08 12:23:04 +02:00
committed by GitHub
parent c6daf8c26b
commit 3c88bf1ec6
253 changed files with 5265 additions and 3649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

83
maxscale-system-test/config_operations.cpp
View File

@ -33,13 +33,13 @@ void Config::add_server(int num)
{
test_->tprintf("Adding the servers");
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin add server server%d " SERVICE_NAME1, num);
test_->ssh_maxscale(true, "maxadmin add server server%d " SERVICE_NAME2, num);
test_->ssh_maxscale(true, "maxadmin add server server%d " SERVICE_NAME3, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin add server server%d " SERVICE_NAME1, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin add server server%d " SERVICE_NAME2, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin add server server%d " SERVICE_NAME3, num);
for (auto& a : created_monitors_)
{
test_->ssh_maxscale(true, "maxadmin add server server%d %s", num, a.c_str());
test_->maxscales->ssh_node_f(0, true, "maxadmin add server server%d %s", num, a.c_str());
}
test_->stop_timeout();
@ -48,13 +48,13 @@ void Config::add_server(int num)
void Config::remove_server(int num)
{
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin remove server server%d " SERVICE_NAME1, num);
test_->ssh_maxscale(true, "maxadmin remove server server%d " SERVICE_NAME2, num);
test_->ssh_maxscale(true, "maxadmin remove server server%d " SERVICE_NAME3, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin remove server server%d " SERVICE_NAME1, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin remove server server%d " SERVICE_NAME2, num);
test_->maxscales->ssh_node_f(0, true, "maxadmin remove server server%d " SERVICE_NAME3, num);
for (auto& a : created_monitors_)
{
test_->ssh_maxscale(true, "maxadmin remove server server%d %s", num, a.c_str());
test_->maxscales->ssh_node_f(0, true, "maxadmin remove server server%d %s", num, a.c_str());
}
test_->stop_timeout();
@ -64,14 +64,14 @@ void Config::add_created_servers(const char *object)
{
for (auto a : created_servers_)
{
test_->ssh_maxscale(true, "maxadmin add server server%d %s", a, object);
test_->maxscales->ssh_node_f(0, true, "maxadmin add server server%d %s", a, object);
}
}
void Config::destroy_server(int num)
{
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin destroy server server%d", num);
test_->maxscales->ssh_node_f(0, true, "maxadmin destroy server server%d", num);
created_servers_.erase(num);
test_->stop_timeout();
}
@ -79,35 +79,35 @@ void Config::destroy_server(int num)
void Config::create_server(int num)
{
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin create server server%d %s %d",
num, test_->repl->IP[num], test_->repl->port[num]);
test_->maxscales->ssh_node_f(0, true, "maxadmin create server server%d %s %d",
num, test_->repl->IP[num], test_->repl->port[num]);
created_servers_.insert(num);
test_->stop_timeout();
}
void Config::alter_server(int num, const char *key, const char *value)
{
test_->ssh_maxscale(true, "maxadmin alter server server%d %s=%s", num, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter server server%d %s=%s", num, key, value);
}
void Config::alter_server(int num, const char *key, int value)
{
test_->ssh_maxscale(true, "maxadmin alter server server%d %s=%d", num, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter server server%d %s=%d", num, key, value);
}
void Config::alter_server(int num, const char *key, float value)
{
test_->ssh_maxscale(true, "maxadmin alter server server%d %s=%f", num, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter server server%d %s=%f", num, key, value);
}
void Config::create_monitor(const char *name, const char *module, int interval)
{
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin create monitor %s %s", name, module);
test_->maxscales->ssh_node_f(0, true, "maxadmin create monitor %s %s", name, module);
alter_monitor(name, "monitor_interval", interval);
alter_monitor(name, "user", test_->maxscale_user);
alter_monitor(name, "password", test_->maxscale_password);
test_->ssh_maxscale(true, "maxadmin restart monitor %s", name);
alter_monitor(name, "user", test_->maxscales->user_name);
alter_monitor(name, "password", test_->maxscales->password);
test_->maxscales->ssh_node_f(0, true, "maxadmin restart monitor %s", name);
test_->stop_timeout();
created_monitors_.insert(std::string(name));
@ -115,28 +115,28 @@ void Config::create_monitor(const char *name, const char *module, int interval)
void Config::alter_monitor(const char* name, const char *key, const char *value)
{
test_->ssh_maxscale(true, "maxadmin alter monitor %s %s=%s", name, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter monitor %s %s=%s", name, key, value);
}
void Config::alter_monitor(const char* name, const char *key, int value)
{
test_->ssh_maxscale(true, "maxadmin alter monitor %s %s=%d", name, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter monitor %s %s=%d", name, key, value);
}
void Config::alter_monitor(const char* name, const char *key, float value)
{
test_->ssh_maxscale(true, "maxadmin alter monitor %s %s=%f", name, key, value);
test_->maxscales->ssh_node_f(0, true, "maxadmin alter monitor %s %s=%f", name, key, value);
}
void Config::start_monitor(const char *name)
{
test_->ssh_maxscale(true, "maxadmin restart monitor %s", name);
test_->maxscales->ssh_node_f(0, true, "maxadmin restart monitor %s", name);
}
void Config::destroy_monitor(const char *name)
{
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin destroy monitor %s", name);
test_->maxscales->ssh_node_f(0, true, "maxadmin destroy monitor %s", name);
test_->stop_timeout();
created_monitors_.erase(std::string(name));
}
@ -145,8 +145,8 @@ void Config::restart_monitors()
{
for (auto& a : created_monitors_)
{
test_->ssh_maxscale(true, "maxadmin shutdown monitor \"%s\"", a.c_str());
test_->ssh_maxscale(true, "maxadmin restart monitor \"%s\"", a.c_str());
test_->maxscales->ssh_node_f(0, true, "maxadmin shutdown monitor \"%s\"", a.c_str());
test_->maxscales->ssh_node_f(0, true, "maxadmin restart monitor \"%s\"", a.c_str());
}
}
@ -155,10 +155,10 @@ void Config::create_listener(Config::Service service)
int i = static_cast<int>(service);
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin create listener %s %s default %d",
services[i].service,
services[i].listener,
services[i].port);
test_->maxscales->ssh_node_f(0, true, "maxadmin create listener %s %s default %d",
services[i].service,
services[i].listener,
services[i].port);
test_->stop_timeout();
}
@ -167,13 +167,13 @@ void Config::create_ssl_listener(Config::Service service)
int i = static_cast<int>(service);
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin create listener %s %s default %d default default default "
"/home/vagrant/certs/server-key.pem "
"/home/vagrant/certs/server-cert.pem "
"/home/vagrant/certs/ca.pem ",
services[i].service,
services[i].listener,
services[i].port);
test_->maxscales->ssh_node_f(0, true, "maxadmin create listener %s %s default %d default default default "
"/home/vagrant/certs/server-key.pem "
"/home/vagrant/certs/server-cert.pem "
"/home/vagrant/certs/ca.pem ",
services[i].service,
services[i].listener,
services[i].port);
test_->stop_timeout();
}
@ -182,8 +182,8 @@ void Config::destroy_listener(Config::Service service)
int i = static_cast<int>(service);
test_->set_timeout(120);
test_->ssh_maxscale(true, "maxadmin destroy listener %s %s",
services[i].service, services[i].listener);
test_->maxscales->ssh_node_f(0, true, "maxadmin destroy listener %s %s",
services[i].service, services[i].listener);
test_->stop_timeout();
}
@ -211,8 +211,9 @@ bool Config::check_server_count(int expected)
{
bool rval = true;
if (test_->ssh_maxscale(true, "test \"`maxadmin list servers|grep 'server[0-9]'|wc -l`\" == \"%d\"",
expected))
if (test_->maxscales->ssh_node_f(0, true,
"test \"`maxadmin list servers|grep 'server[0-9]'|wc -l`\" == \"%d\"",
expected))
{
test_->add_result(1, "Number of servers is not %d.", expected);
rval = false;