Skip to content

Commit

Permalink
DPL: actually pass session when creating Transport
Browse files Browse the repository at this point in the history
this might explain some sporadic crashes in the affected tests, due to session overllap.
  • Loading branch information
ktf committed Nov 21, 2023
1 parent 6542824 commit 0da03c5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions DataFormats/MemoryResources/test/testMemoryResources.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(transportallocatormap_test)
config.SetProperty<std::string>("session", std::to_string(session));

auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "transportallocatormap_test", &config);
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
auto allocSHM = getTransportAllocator(factorySHM.get());
BOOST_CHECK(allocZMQ != nullptr && allocSHM != allocZMQ);
Expand All @@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(allocator_test)
config.SetProperty<std::string>("session", std::to_string(session));

auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "allocator_test", &config);
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
auto allocSHM = getTransportAllocator(factorySHM.get());

Expand Down Expand Up @@ -107,7 +107,7 @@ BOOST_AUTO_TEST_CASE(getMessage_test)
config.SetProperty<std::string>("session", std::to_string(session));

auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "getMessage_test", &config);
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
auto allocSHM = getTransportAllocator(factorySHM.get());

Expand Down Expand Up @@ -159,7 +159,7 @@ BOOST_AUTO_TEST_CASE(adoptVector_test)
config.SetProperty<std::string>("session", std::to_string(session));

auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "adoptVector_test", &config);
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
auto allocSHM = getTransportAllocator(factorySHM.get());

Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/test/test_FairMQ.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ TEST_CASE("getMessage_Stack")
config.SetProperty<std::string>("session", std::to_string(session));

auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "getMessage_Stack", &config);
REQUIRE(factorySHM != nullptr);
REQUIRE(factoryZMQ != nullptr);
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
Expand Down

0 comments on commit 0da03c5

Please sign in to comment.