Mirror/FairMQ
1
0
Fork 0
mirror of https://github.com/FairRootGroup/FairMQ.git synced 2025-10-13 16:46:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: Increase robustness of the test suite for high -j

Browse Source
This commit is contained in:
Dennis Klein 2022-03-24 13:10:29 +01:00
parent ac1904661a
commit b798b1e098
6 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fairmq/tools/Process.cxx
View File

@ -77,8 +77,8 @@ execute_result execute(const string& cmd, const string& prefix, const string& in
bp::async_pipe errorPipe(ios); bp::async_pipe errorPipe(ios);
const string delimiter = "\n"; const string delimiter = "\n";
ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(100)); // NOLINT ba::deadline_timer inputTimer(ios, boost::posix_time::milliseconds(1000)); // NOLINT
ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(400)); // NOLINT ba::deadline_timer signalTimer(ios, boost::posix_time::milliseconds(2000)); // NOLINT
// child process // child process
bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe); bp::child c(cmd, bp::std_out > outputPipe, bp::std_err > errorPipe, bp::std_in < inputPipe);

30
test/CMakeLists.txt
View File

@ -65,7 +65,7 @@ add_testsuite(Protocols
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/protocols ${CMAKE_CURRENT_SOURCE_DIR}/protocols
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )
@ -78,7 +78,7 @@ add_testsuite(Parts
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/parts ${CMAKE_CURRENT_SOURCE_DIR}/parts
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(Message add_testsuite(Message
@ -90,7 +90,7 @@ add_testsuite(Message
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/message ${CMAKE_CURRENT_SOURCE_DIR}/message
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )
@ -104,7 +104,7 @@ add_testsuite(Region
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/region ${CMAKE_CURRENT_SOURCE_DIR}/region
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )
@ -127,7 +127,7 @@ add_testsuite(Device
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/device ${CMAKE_CURRENT_SOURCE_DIR}/device
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
set(VERSION_MAJOR 1) set(VERSION_MAJOR 1)
@ -172,7 +172,7 @@ add_testsuite(Plugins
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 DEPENDS FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(PluginsPrelinked add_testsuite(PluginsPrelinked
@ -183,7 +183,7 @@ add_testsuite(PluginsPrelinked
LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2 LINKS FairMQ FairMQPlugin_test_dummy FairMQPlugin_test_dummy2
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(PluginServices add_testsuite(PluginServices
@ -196,7 +196,7 @@ add_testsuite(PluginServices
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(EventManager add_testsuite(EventManager
@ -207,7 +207,7 @@ add_testsuite(EventManager
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(Properties add_testsuite(Properties
@ -219,7 +219,7 @@ add_testsuite(Properties
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
# add_testsuite(StateMachine # add_testsuite(StateMachine
@ -241,7 +241,7 @@ add_testsuite(Tools
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(Channel add_testsuite(Channel
@ -252,7 +252,7 @@ add_testsuite(Channel
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
) )
add_testsuite(Transport add_testsuite(Transport
@ -265,7 +265,7 @@ add_testsuite(Transport
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )
@ -277,7 +277,7 @@ add_testsuite(Poller
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )
@ -289,6 +289,6 @@ add_testsuite(MemoryResources
LINKS FairMQ LINKS FairMQ
INCLUDES ${CMAKE_CURRENT_SOURCE_DIR} INCLUDES ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
TIMEOUT 5 TIMEOUT 20
${definitions} ${definitions}
) )

2
test/device/TestReceiver.h
View File

@ -28,7 +28,7 @@ class Receiver : public Device
protected: protected:
auto Init() -> void override 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 auto Run() -> void override

2
test/device/TestSender.h
View File

@ -28,7 +28,7 @@ class Sender : public Device
protected: protected:
auto Init() -> void override 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 auto Run() -> void override

5
test/memory_resources/_memory_resources.cxx
View File

@ -76,10 +76,9 @@ int TestData::ndeallocations = 0;
TEST(MemoryResources, transportAllocatorMap) TEST(MemoryResources, transportAllocatorMap)
{ {
// size_t session{tools::UuidHash()}; size_t session{tools::UuidHash()};
ProgOptions config; ProgOptions config;
// config.SetProperty<string>("session", to_string(session)); config.SetProperty<string>("session", to_string(session));
config.SetProperty<string>("session", "default");
FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config); FactoryType factoryZMQ = TransportFactory::CreateTransportFactory("zeromq", fair::mq::tools::Uuid(), &config);
FactoryType factorySHM = TransportFactory::CreateTransportFactory("shmem", fair::mq::tools::Uuid(), &config); FactoryType factorySHM = TransportFactory::CreateTransportFactory("shmem", fair::mq::tools::Uuid(), &config);

3
test/region/_region.cxx
View File

@ -45,8 +45,9 @@ void RegionsSizeMismatch()
ASSERT_EQ(region2, nullptr); 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 session1 = tools::UuidHash();
size_t session2 = tools::UuidHash(); size_t session2 = tools::UuidHash();