diff options
Diffstat (limited to 'cpp/test')
25 files changed, 28 insertions, 308 deletions
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp index bd2b65646f1..343430d3b57 100644 --- a/cpp/test/Ice/exceptions/AllTests.cpp +++ b/cpp/test/Ice/exceptions/AllTests.cpp @@ -49,27 +49,7 @@ ThrowerPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; - string ref; - - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - string secure; - - if (protocol.empty()) - { - protocol = "tcp"; - } - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - - string endpts = protocol + " -p 12345 -t 2000"; - - ref = "thrower" + secure + ":" + endpts; - + string ref = "thrower:default -p 12345 -t 2000"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp index c8486e3857a..cb2be202a7d 100644 --- a/cpp/test/Ice/exceptions/Collocated.cpp +++ b/cpp/test/Ice/exceptions/Collocated.cpp @@ -16,16 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, Ice::stringToIdentity("thrower")); diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp index 86fdbda3c76..2372531fd5c 100644 --- a/cpp/test/Ice/exceptions/Server.cpp +++ b/cpp/test/Ice/exceptions/Server.cpp @@ -17,16 +17,8 @@ int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - properties->setProperty("Ice.WarnAboutServerExceptions", "0"); - string endpts = protocol + " -p 12345 -t 2000"; + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new ThrowerI(adapter); adapter->add(object, Ice::stringToIdentity("thrower")); diff --git a/cpp/test/Ice/facets/AllTests.cpp b/cpp/test/Ice/facets/AllTests.cpp index e9d7076be60..845e462a417 100644 --- a/cpp/test/Ice/facets/AllTests.cpp +++ b/cpp/test/Ice/facets/AllTests.cpp @@ -17,24 +17,8 @@ using namespace std; GPrx allTests(const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string secure; - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - cout << "testing stringToProxy... " << flush; - string ref = "d" + secure + ":" + protocol + " -p 12345 -t 2000"; + string ref = "d:default -p 12345 -t 2000"; Ice::ObjectPrx db = communicator->stringToProxy(ref); test(db); cout << "ok" << endl; diff --git a/cpp/test/Ice/facets/Collocated.cpp b/cpp/test/Ice/facets/Collocated.cpp index ea50cd4a321..fee3ebe054f 100644 --- a/cpp/test/Ice/facets/Collocated.cpp +++ b/cpp/test/Ice/facets/Collocated.cpp @@ -16,16 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr d = new DI; adapter->add(d, Ice::stringToIdentity("d")); diff --git a/cpp/test/Ice/facets/Server.cpp b/cpp/test/Ice/facets/Server.cpp index 6ff733cc2b0..d0901d14894 100644 --- a/cpp/test/Ice/facets/Server.cpp +++ b/cpp/test/Ice/facets/Server.cpp @@ -16,16 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr d = new DI; adapter->add(d, Ice::stringToIdentity("d")); diff --git a/cpp/test/Ice/faultTolerance/AllTests.cpp b/cpp/test/Ice/faultTolerance/AllTests.cpp index 9c92d2b1302..b6875f7a409 100644 --- a/cpp/test/Ice/faultTolerance/AllTests.cpp +++ b/cpp/test/Ice/faultTolerance/AllTests.cpp @@ -18,28 +18,12 @@ using namespace std; void allTests(const Ice::CommunicatorPtr& communicator, const vector<int>& ports) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string secure; - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - cout << "testing stringToProxy... " << flush; ostringstream ref; - ref << "test" << secure; + ref << "test"; for (vector<int>::const_iterator p = ports.begin(); p != ports.end(); ++p) { - ref << ":" << protocol << " -t 4000 -p " << *p; + ref << ":default -t 4000 -p " << *p; } Ice::ObjectPrx base = communicator->stringToProxy(ref.str()); test(base); diff --git a/cpp/test/Ice/faultTolerance/Server.cpp b/cpp/test/Ice/faultTolerance/Server.cpp index 84fb65827f2..f2015550c10 100644 --- a/cpp/test/Ice/faultTolerance/Server.cpp +++ b/cpp/test/Ice/faultTolerance/Server.cpp @@ -50,16 +50,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } ostringstream endpts; - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - endpts << protocol << " -p " << port; + endpts << "default -p " << port; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts.str()); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp index 31fcfd902b3..89efb521eb3 100644 --- a/cpp/test/Ice/inheritance/AllTests.cpp +++ b/cpp/test/Ice/inheritance/AllTests.cpp @@ -17,25 +17,8 @@ using namespace std; InitialPrx allTests(const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string secureFlag; - - if (!protocol.compare("ssl")) - { - secureFlag = " -s "; - } - - string ref = "initial" + secureFlag + ":" + protocol + " -p 12345 -t 2000"; - cout << "testing stringToProxy... " << flush; + string ref = "initial:default -p 12345 -t 2000"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp index 30a39fc3ad8..30dfc6b7233 100644 --- a/cpp/test/Ice/inheritance/Collocated.cpp +++ b/cpp/test/Ice/inheritance/Collocated.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, Ice::stringToIdentity("initial")); diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp index 3d1a3ab494d..72c3d71a759 100644 --- a/cpp/test/Ice/inheritance/Server.cpp +++ b/cpp/test/Ice/inheritance/Server.cpp @@ -16,16 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new InitialI(adapter); adapter->add(object, Ice::stringToIdentity("initial")); diff --git a/cpp/test/Ice/locationForward/AllTests.cpp b/cpp/test/Ice/locationForward/AllTests.cpp index b8c07ae253a..c3ce91c96fb 100644 --- a/cpp/test/Ice/locationForward/AllTests.cpp +++ b/cpp/test/Ice/locationForward/AllTests.cpp @@ -17,27 +17,13 @@ using namespace std; void allTests(const Ice::CommunicatorPtr& communicator, int port, int lastPort) { - Ice::PropertiesPtr properties = communicator->getProperties(); - string protocol = properties->getProperty("Ice.Protocol"); - string secure; - - if (protocol.empty()) - { - protocol = "tcp"; - } - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - cout << "testing stringToProxy... " << flush; ostringstream ref; - ref << "test" << secure << ":" << protocol << " -t 2000 -p " << port; + ref << "test:default -t 2000 -p " << port; Ice::ObjectPrx base = communicator->stringToProxy(ref.str()); test(base); ostringstream lastRef; - lastRef << "test" << secure << ":" << protocol << " -t 2000 -p " << lastPort; + lastRef << "test:default -t 2000 -p " << lastPort; Ice::ObjectPrx lastBase = communicator->stringToProxy(lastRef.str()); test(lastBase); cout << "ok" << endl; diff --git a/cpp/test/Ice/locationForward/Server.cpp b/cpp/test/Ice/locationForward/Server.cpp index ddf7991b603..f5052e6faba 100644 --- a/cpp/test/Ice/locationForward/Server.cpp +++ b/cpp/test/Ice/locationForward/Server.cpp @@ -62,16 +62,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) } ostringstream endpts; - - Ice::PropertiesPtr properties = communicator->getProperties(); - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - endpts << protocol << " -p " << port; + endpts << "default -p " << port; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts.str()); Ice::ObjectPtr object = new TestI(adapter, fwd); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp index 999f712ca18..d56035fae13 100644 --- a/cpp/test/Ice/objects/AllTests.cpp +++ b/cpp/test/Ice/objects/AllTests.cpp @@ -18,26 +18,7 @@ InitialPrx allTests(const Ice::CommunicatorPtr& communicator, bool collocated) { cout << "testing stringToProxy... " << flush; - - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - string secure; - - if (protocol.empty()) - { - protocol = "tcp"; - } - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - - string endpts = protocol + " -p 12345 -t 2000"; - - string ref = "initial" + secure + ":" + endpts; - + string ref = "initial:default -p 12345 -t 2000"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp index c9ca12a6a8c..797575818b8 100644 --- a/cpp/test/Ice/objects/Collocated.cpp +++ b/cpp/test/Ice/objects/Collocated.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); InitialPtr initial = new InitialI(adapter); adapter->add(initial, Ice::stringToIdentity("initial")); diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp index f24b631536b..26fc8ddf062 100644 --- a/cpp/test/Ice/objects/Server.cpp +++ b/cpp/test/Ice/objects/Server.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); InitialPtr initial = new InitialI(adapter); adapter->add(initial, Ice::stringToIdentity("initial")); diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp index 53bcfc17831..93cafd817eb 100644 --- a/cpp/test/Ice/operations/AllTests.cpp +++ b/cpp/test/Ice/operations/AllTests.cpp @@ -17,34 +17,8 @@ using namespace std; Test::MyClassPrx allTests(const Ice::CommunicatorPtr& communicator) { - string ref; - - Ice::PropertiesPtr properties = communicator->getProperties(); - - string address = properties->getProperty("Ice.Address"); - string protocol = properties->getProperty("Ice.Protocol"); - string secure; - - if (protocol.empty()) - { - protocol = "tcp"; - } - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - - string endpts = protocol + " -p 12345 -t 2000"; - - if (!address.empty()) - { - endpts += " -h " + address; - } - - ref = "test" + secure + ":" + endpts; - cout << "testing stringToProxy... " << flush; + string ref = "test:default -p 12345 -t 2000"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp index 96fda8fd7ac..48bf0bd5f22 100644 --- a/cpp/test/Ice/operations/Collocated.cpp +++ b/cpp/test/Ice/operations/Collocated.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new MyDerivedClassI(adapter, Ice::stringToIdentity("test")); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp index a175fa47773..3c4654b7a66 100644 --- a/cpp/test/Ice/operations/Server.cpp +++ b/cpp/test/Ice/operations/Server.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new MyDerivedClassI(adapter, Ice::stringToIdentity("test")); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/IcePack/simple/AllTests.cpp b/cpp/test/IcePack/simple/AllTests.cpp index 6bcad969b47..e581de549c0 100644 --- a/cpp/test/IcePack/simple/AllTests.cpp +++ b/cpp/test/IcePack/simple/AllTests.cpp @@ -18,27 +18,7 @@ TestPrx allTests(const Ice::CommunicatorPtr& communicator) { cout << "testing stringToProxy... " << flush; - string ref; - - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - string secure; - - if (protocol.empty()) - { - protocol = "tcp"; - } - - if (protocol.compare("ssl") == 0) - { - secure = " -s "; - } - - string endpts = protocol + " -p 12346 -t 2000"; - - ref = "test" + secure + ":" + endpts; - + string ref = "test:default -p 12346 -t 2000"; Ice::ObjectPrx base = communicator->stringToProxy(ref); test(base); cout << "ok" << endl; diff --git a/cpp/test/IcePack/simple/Collocated.cpp b/cpp/test/IcePack/simple/Collocated.cpp index 1c2b5891388..cbddcd886a8 100644 --- a/cpp/test/IcePack/simple/Collocated.cpp +++ b/cpp/test/IcePack/simple/Collocated.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 2000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/IcePack/simple/Server.cpp b/cpp/test/IcePack/simple/Server.cpp index 9cdd46993ce..f936bfa400f 100644 --- a/cpp/test/IcePack/simple/Server.cpp +++ b/cpp/test/IcePack/simple/Server.cpp @@ -16,17 +16,7 @@ using namespace std; int run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) { - Ice::PropertiesPtr properties = communicator->getProperties(); - - string protocol = properties->getProperty("Ice.Protocol"); - - if (protocol.empty()) - { - protocol = "tcp"; - } - - string endpts = protocol + " -p 12345 -t 5000"; - + string endpts = "default -p 12345 -t 2000"; Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("TestAdapter", endpts); Ice::ObjectPtr object = new TestI(adapter); adapter->add(object, Ice::stringToIdentity("test")); diff --git a/cpp/test/IcePack/simple/run.py b/cpp/test/IcePack/simple/run.py index 691b863191d..67ded103f8f 100755 --- a/cpp/test/IcePack/simple/run.py +++ b/cpp/test/IcePack/simple/run.py @@ -28,8 +28,8 @@ updatedClientOptions = TestUtil.clientOptions.replace("TOPLEVELDIR", toplevel) updatedClientServerOptions = TestUtil.clientServerOptions.replace("TOPLEVELDIR", toplevel) command = icePack + updatedClientServerOptions + ' --nowarn' + \ - r' "--Ice.Adapter.Forward.Endpoints=' + TestUtil.protocol + ' -p 12346 -t 5000"' + \ - r' "--Ice.Adapter.Admin.Endpoints=' + TestUtil.protocol + ' -p 12347 -t 5000"' + r' "--Ice.Adapter.Forward.Endpoints=default -p 12346 -t 5000"' + \ + r' "--Ice.Adapter.Admin.Endpoints=default -p 12347 -t 5000"' print "starting icepack...", icePackPipe = os.popen(command) TestUtil.getServerPid(icePackPipe) diff --git a/cpp/test/IceStorm/single/Subscriber.cpp b/cpp/test/IceStorm/single/Subscriber.cpp index 02eb232146f..9c6538f2430 100644 --- a/cpp/test/IceStorm/single/Subscriber.cpp +++ b/cpp/test/IceStorm/single/Subscriber.cpp @@ -90,7 +90,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator) return EXIT_FAILURE; } - Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("ClockAdapter", "tcp"); + Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapterWithEndpoints("ClockAdapter", "default"); Ice::ObjectPtr single = new SingleI(communicator); Ice::ObjectPrx object = adapter->add(single, Ice::stringToIdentity("events#single")); diff --git a/cpp/test/IceStorm/single/run.py b/cpp/test/IceStorm/single/run.py index d1391398994..ddabe9e1211 100755 --- a/cpp/test/IceStorm/single/run.py +++ b/cpp/test/IceStorm/single/run.py @@ -40,7 +40,7 @@ TestUtil.cleanDbDir(dbdir) # TODO: --dbdir is a hack # command = iceStorm + updatedClientServerOptions + \ - r' --Ice.Adapter.TopicManager.Endpoints="tcp -p 12345"' + \ + r' --Ice.Adapter.TopicManager.Endpoints="default -p 12345"' + \ r' --dbdir ' + os.path.join(testdir, "db") print "starting icestorm...", |