Skip to content

Commit 0da03c5

Browse files
committed
DPL: actually pass session when creating Transport
this might explain some sporadic crashes in the affected tests, due to session overllap.
1 parent 6542824 commit 0da03c5

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

DataFormats/MemoryResources/test/testMemoryResources.cxx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(transportallocatormap_test)
5252
config.SetProperty<std::string>("session", std::to_string(session));
5353

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

7171
auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
72-
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
72+
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "allocator_test", &config);
7373
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
7474
auto allocSHM = getTransportAllocator(factorySHM.get());
7575

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

109109
auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
110-
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
110+
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "getMessage_test", &config);
111111
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
112112
auto allocSHM = getTransportAllocator(factorySHM.get());
113113

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

161161
auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
162-
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
162+
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "adoptVector_test", &config);
163163
auto allocZMQ = getTransportAllocator(factoryZMQ.get());
164164
auto allocSHM = getTransportAllocator(factorySHM.get());
165165

Framework/Core/test/test_FairMQ.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ TEST_CASE("getMessage_Stack")
105105
config.SetProperty<std::string>("session", std::to_string(session));
106106

107107
auto factoryZMQ = fair::mq::TransportFactory::CreateTransportFactory("zeromq");
108-
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem");
108+
auto factorySHM = fair::mq::TransportFactory::CreateTransportFactory("shmem", "getMessage_Stack", &config);
109109
REQUIRE(factorySHM != nullptr);
110110
REQUIRE(factoryZMQ != nullptr);
111111
auto allocZMQ = getTransportAllocator(factoryZMQ.get());

0 commit comments

Comments
 (0)