diff options
author | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-09-13 13:52:49 +0200 |
---|---|---|
committer | Arnstein Ressem <aressem@yahoo-inc.com> | 2016-09-13 13:52:49 +0200 |
commit | c176d72f4c4ce4364c616d5883df542f8a55cbaa (patch) | |
tree | d84ccf3b5c4d762a7e958d4dc76ddc0f713bb6fb /messagebus_test | |
parent | e099b5e21c5ef4739bb3b2ea67ba4a539856001e (diff) |
Add missing rouging.cfg
Diffstat (limited to 'messagebus_test')
-rw-r--r-- | messagebus_test/src/tests/trace/routing-template.cfg | 32 | ||||
-rw-r--r-- | messagebus_test/src/tests/trace/trace.cpp | 5 | ||||
-rw-r--r-- | messagebus_test/testrun/.gitignore | 9 |
3 files changed, 37 insertions, 9 deletions
diff --git a/messagebus_test/src/tests/trace/routing-template.cfg b/messagebus_test/src/tests/trace/routing-template.cfg new file mode 100644 index 00000000000..72318131b99 --- /dev/null +++ b/messagebus_test/src/tests/trace/routing-template.cfg @@ -0,0 +1,32 @@ +routingtable[1] +routingtable[0].protocol "Simple" +routingtable[0].hop[3] +routingtable[0].hop[0].name "hop1" +routingtable[0].hop[0].selector "server/[All]/1/[All]/session" +routingtable[0].hop[0].recipient[2] +routingtable[0].hop[0].recipient[0] "server/cpp/1/A/session" +routingtable[0].hop[0].recipient[1] "server/java/1/A/session" +routingtable[0].hop[1].name "hop2" +routingtable[0].hop[1].selector "server/[All]/2/[All]/session" +routingtable[0].hop[1].recipient[4] +routingtable[0].hop[1].recipient[0] "server/cpp/2/A/session" +routingtable[0].hop[1].recipient[1] "server/cpp/2/B/session" +routingtable[0].hop[1].recipient[2] "server/java/2/A/session" +routingtable[0].hop[1].recipient[3] "server/java/2/B/session" +routingtable[0].hop[2].name "hop3" +routingtable[0].hop[2].selector "server/[All]/3/[All]/session" +routingtable[0].hop[2].recipient[8] +routingtable[0].hop[2].recipient[0] "server/cpp/3/A/session" +routingtable[0].hop[2].recipient[1] "server/cpp/3/B/session" +routingtable[0].hop[2].recipient[2] "server/cpp/3/C/session" +routingtable[0].hop[2].recipient[3] "server/cpp/3/D/session" +routingtable[0].hop[2].recipient[4] "server/java/3/A/session" +routingtable[0].hop[2].recipient[5] "server/java/3/B/session" +routingtable[0].hop[2].recipient[6] "server/java/3/C/session" +routingtable[0].hop[2].recipient[7] "server/java/3/D/session" +routingtable[0].route[1] +routingtable[0].route[0].name "test" +routingtable[0].route[0].hop[3] +routingtable[0].route[0].hop[0] "hop1" +routingtable[0].route[0].hop[1] "hop2" +routingtable[0].route[0].hop[2] "hop3" diff --git a/messagebus_test/src/tests/trace/trace.cpp b/messagebus_test/src/tests/trace/trace.cpp index 320110d10e2..f25c776ca74 100644 --- a/messagebus_test/src/tests/trace/trace.cpp +++ b/messagebus_test/src/tests/trace/trace.cpp @@ -45,6 +45,7 @@ Test::Main() { TEST_INIT("trace_test"); Slobrok slobrok; + const std::string routing_template = TEST_PATH("routing-template.cfg"); const std::string ctl_script = TEST_PATH("ctl.sh"); { // Make slobrok config @@ -52,6 +53,10 @@ Test::Main() EXPECT_TRUE(system(make_string("echo 'slobrok[0].connectionspec tcp/localhost:%d' " ">> slobrok.cfg", slobrok.port()).c_str()) == 0); } + { // Make routing config + EXPECT_TRUE(system(("cat " + routing_template + " > routing.cfg").c_str()) == 0); + } + EXPECT_TRUE(system((ctl_script + " start all").c_str()) == 0); RPCMessageBus mb(ProtocolSet().add(IProtocol::SP(new SimpleProtocol())), RPCNetworkParams().setSlobrokConfig("file:slobrok.cfg"), diff --git a/messagebus_test/testrun/.gitignore b/messagebus_test/testrun/.gitignore deleted file mode 100644 index b29b0c6486c..00000000000 --- a/messagebus_test/testrun/.gitignore +++ /dev/null @@ -1,9 +0,0 @@ -test-report.html -test-report.html.* -test.*.*.desc -test.*.*.file.* -test.*.*.files.html -test.*.*.log -tmp.* -xsync.log -/test.*.*.result |