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

Fix address clashes in tests

Browse Source
This commit is contained in:
Alexey Rybalchenko 2023-10-24 11:54:35 +02:00
parent b40db42196
commit df672af2e5
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
test/message/_message.cxx
View File

@ -50,7 +50,7 @@ auto RunPushPullWithMsgResize(string const & transport, string const & _address,
Channel push{"Push", "push", factory}; Channel push{"Push", "push", factory};
Channel pull{"Pull", "pull", factory}; Channel pull{"Pull", "pull", factory};
auto const address(tools::ToString(_address, "_", transport)); auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
push.Bind(address); push.Bind(address);
pull.Connect(address); pull.Connect(address);
@ -153,7 +153,7 @@ auto RunPushPullWithAlignment(string const& transport, string const& _address, b
Channel push{"Push", "push", factory}; Channel push{"Push", "push", factory};
Channel pull{"Pull", "pull", factory}; Channel pull{"Pull", "pull", factory};
auto const address(tools::ToString(_address, "_", transport)); auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
push.Bind(address); push.Bind(address);
pull.Connect(address); pull.Connect(address);
@ -211,7 +211,7 @@ auto EmptyMessage(string const& transport, string const& _address, bool expanded
Channel push{"Push", "push", factory}; Channel push{"Push", "push", factory};
Channel pull{"Pull", "pull", factory}; Channel pull{"Pull", "pull", factory};
auto const address(tools::ToString(_address, "_", transport)); auto const address(tools::ToString(_address, "_", transport, "_", config.GetProperty<string>("session")));
push.Bind(address); push.Bind(address);
pull.Connect(address); pull.Connect(address);
@ -321,8 +321,8 @@ auto ZeroCopyFromUnmanaged(string const& address, bool expandedShmMetadata = fal
Channel push("Push", "push", factory1); Channel push("Push", "push", factory1);
Channel pull("Pull", "pull", factory2); Channel pull("Pull", "pull", factory2);
push.Bind(address); push.Bind(address + "_" + session);
pull.Connect(address); pull.Connect(address + "_" + session);
const size_t offset = 100; const size_t offset = 100;
auto msg1(push.NewMessage(region, static_cast<char*>(region->GetData()), msgSize, nullptr)); auto msg1(push.NewMessage(region, static_cast<char*>(region->GetData()), msgSize, nullptr));

5
test/protocols/_push_pull_multipart.cxx
View File

@ -35,6 +35,9 @@ auto RunSingleThreadedMultipart(string transport, string address1, string addres
config.SetProperty<size_t>("shm-metadata-msg-size", 2048); config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
} }
address1 += "_" + config.GetProperty<string>("session");
address2 += "_" + config.GetProperty<string>("session");
auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config); auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
Channel push1("Push1", "push", factory); Channel push1("Push1", "push", factory);
@ -118,6 +121,8 @@ auto RunMultiThreadedMultipart(string transport, string address1, bool expandedS
config.SetProperty<size_t>("shm-metadata-msg-size", 2048); config.SetProperty<size_t>("shm-metadata-msg-size", 2048);
} }
address1 += "_" + config.GetProperty<string>("session");
auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config); auto factory = TransportFactory::CreateTransportFactory(transport, tools::Uuid(), &config);
Channel push1("Push1", "push", factory); Channel push1("Push1", "push", factory);