From 5c53c5aa22e335288b29e8e1bc585cc3d96688cb Mon Sep 17 00:00:00 2001 From: Dennis Klein Date: Thu, 24 Mar 2022 13:10:29 +0100 Subject: [PATCH] test: Increase robustness of the test suite for high -j --- fairmq/tools/Process.cxx | 4 +-- test/CMakeLists.txt | 30 ++++++++++----------- test/device/TestReceiver.h | 2 +- test/device/TestSender.h | 2 +- test/memory_resources/_memory_resources.cxx | 5 ++-- test/region/_region.cxx | 3 ++- 6 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fairmq/tools/Process.cxx b/fairmq/tools/Process.cxx index 7d82bdaf..179d5daf 100644 --- a/fairmq/tools/Process.cxx +++ b/fairmq/tools/Process.cxx @@ -77,8 +77,8 @@ execute_result execute(const string& cmd, const string& prefix, const string& in bp::async_pipe errorPipe(ios); const string delimiter = "\n"; - ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(100)); // NOLINT - ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(400)); // NOLINT + ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(1000)); // NOLINT + ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(2000)); // NOLINT // child process bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe); diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 89dc9f90..f23e4569 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -65,7 +65,7 @@ add_testsuite(Protocols INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/protocols ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) @@ -78,7 +78,7 @@ add_testsuite(Parts INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/parts ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(Message @@ -90,7 +90,7 @@ add_testsuite(Message INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/message ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) @@ -104,7 +104,7 @@ add_testsuite(Region INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/region ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) @@ -127,7 +127,7 @@ add_testsuite(Device INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/device ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) set(VERSION_MAJOR 1) @@ -172,7 +172,7 @@ add_testsuite(Plugins INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(PluginsPrelinked @@ -183,7 +183,7 @@ add_testsuite(PluginsPrelinked LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(PluginServices @@ -196,7 +196,7 @@ add_testsuite(PluginServices LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(EventManager @@ -207,7 +207,7 @@ add_testsuite(EventManager LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(Properties @@ -219,7 +219,7 @@ add_testsuite(Properties LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) # add_testsuite(StateMachine @@ -241,7 +241,7 @@ add_testsuite(Tools LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(Channel @@ -252,7 +252,7 @@ add_testsuite(Channel LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ) add_testsuite(Transport @@ -265,7 +265,7 @@ add_testsuite(Transport LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) @@ -277,7 +277,7 @@ add_testsuite(Poller LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) @@ -289,6 +289,6 @@ add_testsuite(MemoryResources LINKS FairMQ INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} - TIMEOUT 5 + TIMEOUT 20 ${definitions} ) diff --git a/test/device/TestReceiver.h b/test/device/TestReceiver.h index 3393f432..9d3b7e5c 100644 --- a/test/device/TestReceiver.h +++ b/test/device/TestReceiver.h @@ -28,7 +28,7 @@ class Receiver : public Device protected: auto Init() -> void override { - std::this_thread::sleep_for(std::chrono::milliseconds(200)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); } auto Run() -> void override diff --git a/test/device/TestSender.h b/test/device/TestSender.h index 440ee9ec..dbc314f6 100644 --- a/test/device/TestSender.h +++ b/test/device/TestSender.h @@ -28,7 +28,7 @@ class Sender : public Device protected: auto Init() -> void override { - std::this_thread::sleep_for(std::chrono::milliseconds(200)); + std::this_thread::sleep_for(std::chrono::milliseconds(500)); } auto Run() -> void override diff --git a/test/memory_resources/_memory_resources.cxx b/test/memory_resources/_memory_resources.cxx index 33b95713..d5d563eb 100644 --- a/test/memory_resources/_memory_resources.cxx +++ b/test/memory_resources/_memory_resources.cxx @@ -76,10 +76,9 @@ int TestData::ndeallocations = 0; TEST(MemoryResources, transportAllocatorMap) { - // size_t session{tools::UuidHash()}; + size_t session{tools::UuidHash()}; ProgOptions config; - // config.SetProperty("session", to_string(session)); - config.SetProperty("session", "default"); + config.SetProperty("session", to_string(session)); FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config); FactoryType factorySHM = TransportFactory::CreateTransportFactory("shmem", fair::mq::tools::Uuid(), &config); diff --git a/test/region/_region.cxx b/test/region/_region.cxx index c76eb1e3..59f5a92d 100644 --- a/test/region/_region.cxx +++ b/test/region/_region.cxx @@ -45,8 +45,9 @@ void RegionsSizeMismatch() ASSERT_EQ(region2, nullptr); } -void RegionsCache(const string& transport, const string& address) +void RegionsCache(const string& transport, const string& _address) { + std::string address(tools::ToString(_address, "_", transport)); size_t session1 = tools::UuidHash(); size_t session2 = tools::UuidHash();