From 5b3dbdbf16d74789a3f234a1488e524f14b5a0ba Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Tue, 14 May 2019 14:58:21 +0300 Subject: [PATCH] Fix test_cacheoptions and test_dbfwfilter 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. --- server/modules/filter/cache/test/test_cacheoptions.cc | 4 +++- server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/server/modules/filter/cache/test/test_cacheoptions.cc b/server/modules/filter/cache/test/test_cacheoptions.cc index bb3c9736a..fa525d830 100644 --- a/server/modules/filter/cache/test/test_cacheoptions.cc +++ b/server/modules/filter/cache/test/test_cacheoptions.cc @@ -288,6 +288,8 @@ int test(FilterModule::Instance& filter_instance, const TEST_CASE& tc) { int rv = 0; + static int port = 3306; + MXS_CONFIG_PARAMETER parameters; parameters.set("max_retry_interval", "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; 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_SERVICE, service->name()); diff --git a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc index da99088e8..a89c3623d 100644 --- a/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc +++ b/server/modules/filter/dbfwfilter/test/test_dbfwfilter.cc @@ -773,9 +773,11 @@ int test(FilterModule::Instance& filter_instance, const FW_TEST& t) parameters.set("connection_timeout", "10s"); auto service = service_alloc("service", "readconnroute", ¶meters); + static int port = 3306; + MXS_CONFIG_PARAMETER listener_params; 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_SERVICE, service->name());