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

Fix unit test failures

Browse Source 
The new net_write_timeout value needed to be explicitly defined for the
tests.
This commit is contained in:
Markus Mäkelä
2019-06-11 13:52:41 +03:00
parent 6166da76ea
commit 470968a296
6 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
server/core/test/test_dcb.cc
View File

@ -53,6 +53,7 @@ static int test1()
MXS_CONFIG_PARAMETER parameters; MXS_CONFIG_PARAMETER parameters;
parameters.set("max_retry_interval", "10s"); parameters.set("max_retry_interval", "10s");
parameters.set("connection_timeout", "10s"); parameters.set("connection_timeout", "10s");
parameters.set("net_write_timeout", "10s");
auto service = service_alloc("service", "readconnroute", &parameters); auto service = service_alloc("service", "readconnroute", &parameters);
MXS_CONFIG_PARAMETER listener_params; MXS_CONFIG_PARAMETER listener_params;

1
server/core/test/test_poll.cc
View File

@ -59,6 +59,7 @@ static int test1()
MXS_CONFIG_PARAMETER parameters; MXS_CONFIG_PARAMETER parameters;
parameters.set(CN_MAX_RETRY_INTERVAL, "10s"); parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
parameters.set(CN_CONNECTION_TIMEOUT, "10s"); parameters.set(CN_CONNECTION_TIMEOUT, "10s");
parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
auto service = service_alloc("service", "readconnroute", &parameters); auto service = service_alloc("service", "readconnroute", &parameters);
MXS_CONFIG_PARAMETER listener_params; MXS_CONFIG_PARAMETER listener_params;

2
server/core/test/test_service.cc
View File

@ -64,7 +64,7 @@ static int test1()
MXS_CONFIG_PARAMETER parameters; MXS_CONFIG_PARAMETER parameters;
parameters.set(CN_MAX_RETRY_INTERVAL, "10s"); parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
parameters.set(CN_CONNECTION_TIMEOUT, "10s"); parameters.set(CN_CONNECTION_TIMEOUT, "10s");
parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
/* Service tests */ /* Service tests */
fprintf(stderr, fprintf(stderr,
"testservice : creating service called MyService with router nonexistent"); "testservice : creating service called MyService with router nonexistent");

1
server/modules/filter/cache/test/test_cacheoptions.cc vendored
View File

@ -293,6 +293,7 @@ int test(FilterModule::Instance& filter_instance, const TEST_CASE& tc)
MXS_CONFIG_PARAMETER parameters; MXS_CONFIG_PARAMETER parameters;
parameters.set("max_retry_interval", "10s"); parameters.set("max_retry_interval", "10s");
parameters.set("connection_timeout", "10s"); parameters.set("connection_timeout", "10s");
parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
auto service = service_alloc("service", "readconnroute", &parameters); auto service = service_alloc("service", "readconnroute", &parameters);

1
server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc
View File

@ -771,6 +771,7 @@ int test(FilterModule::Instance& filter_instance, const FW_TEST& t)
MXS_CONFIG_PARAMETER parameters; MXS_CONFIG_PARAMETER parameters;
parameters.set("max_retry_interval", "10s"); parameters.set("max_retry_interval", "10s");
parameters.set("connection_timeout", "10s"); parameters.set("connection_timeout", "10s");
parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
auto service = service_alloc("service", "readconnroute", &parameters); auto service = service_alloc("service", "readconnroute", &parameters);
static int port = 3306; static int port = 3306;

1
server/modules/routing/binlogrouter/test/testbinlog.cc
View File

@ -115,6 +115,7 @@ int main(int argc, char** argv)
config_add_defaults(&ctx, get_module("binlogrouter", MODULE_ROUTER)->parameters); config_add_defaults(&ctx, get_module("binlogrouter", MODULE_ROUTER)->parameters);
ctx.m_parameters.set(CN_MAX_RETRY_INTERVAL, "10s"); ctx.m_parameters.set(CN_MAX_RETRY_INTERVAL, "10s");
ctx.m_parameters.set(CN_CONNECTION_TIMEOUT, "10s"); ctx.m_parameters.set(CN_CONNECTION_TIMEOUT, "10s");
ctx.m_parameters.set(CN_NET_WRITE_TIMEOUT, "10s");
const char* options = "server_id=3,heartbeat=200,binlogdir=/tmp/my_dir," const char* options = "server_id=3,heartbeat=200,binlogdir=/tmp/my_dir,"
"transaction_safety=1,master_version=5.6.99-common," "transaction_safety=1,master_version=5.6.99-common,"