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

fix parallel running tests failure

Browse Source
This commit is contained in:
Alexey Rybalchenko
2016-07-11 10:58:30 +02:00
parent 64f1fd2a3b
commit 13a5cea1d7
7 changed files with 101 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
fairmq/test/runTransferTimeoutTest.cxx
View File

@@ -91,13 +91,23 @@ int main(int argc, char** argv)
{
TransferTimeoutTester timeoutTester;
timeoutTester.CatchSignals();
if (argc == 2)
std::string transport;
if (argc != 2)
{
timeoutTester.SetTransport(argv[1]);
LOG(ERROR) << "Transport for the test not specified!";
return 1;
}
transport = argv[1];
if (transport == "zeromq" || transport == "nanomsg")
{
timeoutTester.SetTransport(transport);
}
else
{
timeoutTester.SetTransport("zeromq");
LOG(ERROR) << "Incorrect transport requested! Expected 'zeromq' or 'nanomsg', found: " << transport;
return 1;
}
reinit_logger(false);
@@ -108,7 +118,7 @@ int main(int argc, char** argv)
dataOutChannel.UpdateType("push");
dataOutChannel.UpdateMethod("bind");
dataOutChannel.UpdateAddress("tcp://127.0.0.1:5559");
if (argc == 2)
if (transport == "nanomsg")
{
dataOutChannel.UpdateAddress("tcp://127.0.0.1:5759");
}
@@ -121,7 +131,7 @@ int main(int argc, char** argv)
dataInChannel.UpdateType("pull");
dataInChannel.UpdateMethod("bind");
dataInChannel.UpdateAddress("tcp://127.0.0.1:5560");
if (argc == 2)
if (transport == "nanomsg")
{
dataInChannel.UpdateAddress("tcp://127.0.0.1:5760");
}