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

Fix test_cacheoptions and test_dbfwfilter

Browse Source 
Due to listener changes we cannot just keep on creating new
listeners with the same port over and over again.

Easiest to simply use a different port each time.
This commit is contained in:
Johan Wikman
2019-05-14 14:58:21 +03:00
parent cefed56c48
commit 5b3dbdbf16
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -288,6 +288,8 @@ int test(FilterModule::Instance& filter_instance, const TEST_CASE& tc)
{ {
int rv = 0; int rv = 0;
static int port = 3306;
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");
@ -296,7 +298,7 @@ int test(FilterModule::Instance& filter_instance, const TEST_CASE& tc)
MXS_CONFIG_PARAMETER listener_params; MXS_CONFIG_PARAMETER listener_params;
listener_params.set(CN_ADDRESS, "0.0.0.0"); listener_params.set(CN_ADDRESS, "0.0.0.0");
listener_params.set(CN_PORT, "3306"); listener_params.set(CN_PORT, std::to_string(port++).c_str());
listener_params.set(CN_PROTOCOL, "mariadbclient"); listener_params.set(CN_PROTOCOL, "mariadbclient");
listener_params.set(CN_SERVICE, service->name()); listener_params.set(CN_SERVICE, service->name());

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

@ -773,9 +773,11 @@ int test(FilterModule::Instance& filter_instance, const FW_TEST& t)
parameters.set("connection_timeout", "10s"); parameters.set("connection_timeout", "10s");
auto service = service_alloc("service", "readconnroute", &parameters); auto service = service_alloc("service", "readconnroute", &parameters);
static int port = 3306;
MXS_CONFIG_PARAMETER listener_params; MXS_CONFIG_PARAMETER listener_params;
listener_params.set(CN_ADDRESS, "0.0.0.0"); listener_params.set(CN_ADDRESS, "0.0.0.0");
listener_params.set(CN_PORT, "3306"); listener_params.set(CN_PORT, std::to_string(port++).c_str());
listener_params.set(CN_PROTOCOL, "mariadbclient"); listener_params.set(CN_PROTOCOL, "mariadbclient");
listener_params.set(CN_SERVICE, service->name()); listener_params.set(CN_SERVICE, service->name());