diff options
Diffstat (limited to 'py')
66 files changed, 101 insertions, 61 deletions
diff --git a/py/allTests.py b/py/allTests.py index 459dd846e59..02a05d6cc8b 100755 --- a/py/allTests.py +++ b/py/allTests.py @@ -42,7 +42,7 @@ tests = [ ("Ice/retry", ["core"]), ("Ice/timeout", ["core"]), ("Ice/servantLocator", ["core"]), - ("Ice/blobject", ["core"]) + ("Ice/blobject", ["core"]), ("Ice/defaultServant", ["core"]) ] diff --git a/py/test/Ice/adapterDeactivation/AllTests.py b/py/test/Ice/adapterDeactivation/AllTests.py index a4f8327ce79..7ccf39a4b45 100644 --- a/py/test/Ice/adapterDeactivation/AllTests.py +++ b/py/test/Ice/adapterDeactivation/AllTests.py @@ -16,7 +16,7 @@ def test(b): def allTests(communicator): print "testing stringToProxy... ", sys.stdout.flush() - base = communicator.stringToProxy("test:default -p 12010 -t 10000") + base = communicator.stringToProxy("test:default -p 12010") test(base) print "ok" diff --git a/py/test/Ice/adapterDeactivation/Collocated.py b/py/test/Ice/adapterDeactivation/Collocated.py index 398be7dce3a..6aa860cf470 100755 --- a/py/test/Ice/adapterDeactivation/Collocated.py +++ b/py/test/Ice/adapterDeactivation/Collocated.py @@ -16,7 +16,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/Server.py b/py/test/Ice/adapterDeactivation/Server.py index ed1d17c1ae2..27b4232aee7 100755 --- a/py/test/Ice/adapterDeactivation/Server.py +++ b/py/test/Ice/adapterDeactivation/Server.py @@ -15,7 +15,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = self.communicator().createObjectAdapter("TestAdapter") locator = TestI.ServantLocatorI() diff --git a/py/test/Ice/adapterDeactivation/run.py b/py/test/Ice/adapterDeactivation/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/adapterDeactivation/run.py +++ b/py/test/Ice/adapterDeactivation/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/binding/AllTests.py b/py/test/Ice/binding/AllTests.py index f206fa7b9ed..1100927e1e9 100644 --- a/py/test/Ice/binding/AllTests.py +++ b/py/test/Ice/binding/AllTests.py @@ -58,7 +58,7 @@ def deactivate(com, adapters): com.deactivateObjectAdapter(p) def allTests(communicator): - ref = "communicator:default -p 12010 -t 10000" + ref = "communicator:default -p 12010" com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref)) print "testing binding with single endpoint...", diff --git a/py/test/Ice/binding/Server.py b/py/test/Ice/binding/Server.py index 58ccfe49715..fb64264e8b4 100755 --- a/py/test/Ice/binding/Server.py +++ b/py/test/Ice/binding/Server.py @@ -16,7 +16,7 @@ import Test, TestI def run(args, communicator): communicator.getProperties().setProperty("Ice.Warn.Connections", "0") - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("communicator") adapter.add(TestI.RemoteCommunicatorI(), id) diff --git a/py/test/Ice/binding/run.py b/py/test/Ice/binding/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/binding/run.py +++ b/py/test/Ice/binding/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/blobject/Client.py b/py/test/Ice/blobject/Client.py index 306b510102b..253565e9064 100755 --- a/py/test/Ice/blobject/Client.py +++ b/py/test/Ice/blobject/Client.py @@ -20,7 +20,7 @@ def test(b): raise RuntimeError('test assertion failed') def run(args, communicator, sync): - hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) + hello = Test.HelloPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) hello.sayHello(False) hello.sayHello(False, { "_fwd":"o" } ) test(hello.add(10, 20) == 30) diff --git a/py/test/Ice/blobject/Server.py b/py/test/Ice/blobject/Server.py index e6f7c58bbe2..5be8f7be478 100755 --- a/py/test/Ice/blobject/Server.py +++ b/py/test/Ice/blobject/Server.py @@ -31,7 +31,7 @@ class TestI(Test.Hello): def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/blobject/run.py b/py/test/Ice/blobject/run.py index 03898f6ba88..9e71481ed14 100755 --- a/py/test/Ice/blobject/run.py +++ b/py/test/Ice/blobject/run.py @@ -26,3 +26,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/checksum/AllTests.py b/py/test/Ice/checksum/AllTests.py index 08ca0071bec..f7544cfe468 100644 --- a/py/test/Ice/checksum/AllTests.py +++ b/py/test/Ice/checksum/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) diff --git a/py/test/Ice/checksum/Server.py b/py/test/Ice/checksum/Server.py index 91bb564f59a..7c6b3d2579e 100755 --- a/py/test/Ice/checksum/Server.py +++ b/py/test/Ice/checksum/Server.py @@ -30,7 +30,7 @@ class ChecksumI(Test.Checksum): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = ChecksumI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/checksum/run.py b/py/test/Ice/checksum/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/checksum/run.py +++ b/py/test/Ice/checksum/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/custom/AllTests.py b/py/test/Ice/custom/AllTests.py index 57b4d6369ed..fea91b9ce70 100644 --- a/py/test/Ice/custom/AllTests.py +++ b/py/test/Ice/custom/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) diff --git a/py/test/Ice/custom/Server.py b/py/test/Ice/custom/Server.py index 718cb7df415..256afc9b6e4 100755 --- a/py/test/Ice/custom/Server.py +++ b/py/test/Ice/custom/Server.py @@ -78,7 +78,7 @@ class CustomI(Test.Custom): self._adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = CustomI(adapter) adapter.add(object, communicator.stringToIdentity("test")) diff --git a/py/test/Ice/custom/run.py b/py/test/Ice/custom/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/custom/run.py +++ b/py/test/Ice/custom/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/defaultServant/run.py b/py/test/Ice/defaultServant/run.py index 4bafa789a82..f4bd81310ba 100755 --- a/py/test/Ice/defaultServant/run.py +++ b/py/test/Ice/defaultServant/run.py @@ -26,3 +26,5 @@ print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() diff --git a/py/test/Ice/exceptions/AllTests.py b/py/test/Ice/exceptions/AllTests.py index 5e241a2761a..610a5cddbc3 100644 --- a/py/test/Ice/exceptions/AllTests.py +++ b/py/test/Ice/exceptions/AllTests.py @@ -333,7 +333,7 @@ def allTests(communicator): print "ok" print "testing stringToProxy...", - ref = "thrower:default -p 12010 -t 10000" + ref = "thrower:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/exceptions/Collocated.py b/py/test/Ice/exceptions/Collocated.py index 5b873dd9ce8..b07d4acdfba 100755 --- a/py/test/Ice/exceptions/Collocated.py +++ b/py/test/Ice/exceptions/Collocated.py @@ -17,7 +17,7 @@ import Test, TestI, AllTests def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/Server.py b/py/test/Ice/exceptions/Server.py index b1d5c499bc0..4706d57d0a1 100755 --- a/py/test/Ice/exceptions/Server.py +++ b/py/test/Ice/exceptions/Server.py @@ -17,7 +17,7 @@ import Test, TestI def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/ServerAMD.py b/py/test/Ice/exceptions/ServerAMD.py index 3eaa1dfa327..ca9ecd81761 100755 --- a/py/test/Ice/exceptions/ServerAMD.py +++ b/py/test/Ice/exceptions/ServerAMD.py @@ -115,7 +115,7 @@ class ThrowerI(Test.Thrower): def run(args, communicator): properties = communicator.getProperties() properties.setProperty("Ice.Warn.Dispatch", "0") - properties.setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + properties.setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") object = ThrowerI(adapter) adapter.add(object, communicator.stringToIdentity("thrower")) diff --git a/py/test/Ice/exceptions/run.py b/py/test/Ice/exceptions/run.py index cbcf10f321e..5d889c09168 100755 --- a/py/test/Ice/exceptions/run.py +++ b/py/test/Ice/exceptions/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/facets/AllTests.py b/py/test/Ice/facets/AllTests.py index 78a665e2687..03ff5015acc 100644 --- a/py/test/Ice/facets/AllTests.py +++ b/py/test/Ice/facets/AllTests.py @@ -86,7 +86,7 @@ def allTests(communicator): adapter.deactivate() print "testing stringToProxy... ", - ref = "d:default -p 12010 -t 10000" + ref = "d:default -p 12010" db = communicator.stringToProxy(ref) test(db) print "ok" diff --git a/py/test/Ice/facets/Collocated.py b/py/test/Ice/facets/Collocated.py index 1bcb1fb959f..6ecaa738fea 100755 --- a/py/test/Ice/facets/Collocated.py +++ b/py/test/Ice/facets/Collocated.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/Server.py b/py/test/Ice/facets/Server.py index f2aa1777029..7f2b9346b69 100755 --- a/py/test/Ice/facets/Server.py +++ b/py/test/Ice/facets/Server.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") d = TestI.DI() adapter.add(d, communicator.stringToIdentity("d")) diff --git a/py/test/Ice/facets/run.py b/py/test/Ice/facets/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/facets/run.py +++ b/py/test/Ice/facets/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/faultTolerance/AllTests.py b/py/test/Ice/faultTolerance/AllTests.py index 1c8d7dfc021..0d6298673ae 100644 --- a/py/test/Ice/faultTolerance/AllTests.py +++ b/py/test/Ice/faultTolerance/AllTests.py @@ -85,7 +85,7 @@ def allTests(communicator, ports): print "testing stringToProxy... ", ref = "test" for p in ports: - ref = ref + ":default -t 60000 -p " + str(p) + ref = ref + ":default -p " + str(p) base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/faultTolerance/run.py b/py/test/Ice/faultTolerance/run.py index 1b4a6840bf1..45a5cb02f73 100755 --- a/py/test/Ice/faultTolerance/run.py +++ b/py/test/Ice/faultTolerance/run.py @@ -44,3 +44,5 @@ clientProc.startReader() clientProc.waitTestSuccess() for p in serverProc: p.waitTestSuccess() + +TestUtil.cleanup() diff --git a/py/test/Ice/inheritance/AllTests.py b/py/test/Ice/inheritance/AllTests.py index ccf6f35e645..b83b902f611 100644 --- a/py/test/Ice/inheritance/AllTests.py +++ b/py/test/Ice/inheritance/AllTests.py @@ -15,7 +15,7 @@ def test(b): def allTests(communicator): print "testing stringToProxy... ", - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" diff --git a/py/test/Ice/inheritance/Collocated.py b/py/test/Ice/inheritance/Collocated.py index 2b4a4e5d614..824d5d83b17 100755 --- a/py/test/Ice/inheritance/Collocated.py +++ b/py/test/Ice/inheritance/Collocated.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/Server.py b/py/test/Ice/inheritance/Server.py index 2c1c4290591..27a92387eb5 100755 --- a/py/test/Ice/inheritance/Server.py +++ b/py/test/Ice/inheritance/Server.py @@ -15,7 +15,7 @@ Ice.loadSlice('Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") object = TestI.InitialI(adapter) adapter.add(object, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/inheritance/run.py b/py/test/Ice/inheritance/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/inheritance/run.py +++ b/py/test/Ice/inheritance/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/location/Client.py b/py/test/Ice/location/Client.py index 9e12066bed6..ecbd624624c 100755 --- a/py/test/Ice/location/Client.py +++ b/py/test/Ice/location/Client.py @@ -24,7 +24,7 @@ def test(b): raise RuntimeError('test assertion failed') def run(args, communicator): - AllTests.allTests(communicator, "ServerManager:default -p 12010 -t 10000") + AllTests.allTests(communicator, "ServerManager:default -p 12010") return True try: diff --git a/py/test/Ice/location/run.py b/py/test/Ice/location/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/location/run.py +++ b/py/test/Ice/location/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/objects/AllTests.py b/py/test/Ice/objects/AllTests.py index 0b6812fd949..2f1df30504e 100644 --- a/py/test/Ice/objects/AllTests.py +++ b/py/test/Ice/objects/AllTests.py @@ -55,7 +55,7 @@ def allTests(communicator, collocated): communicator.addObjectFactory(factory, '::Test::H') print "testing stringToProxy...", - ref = "initial:default -p 12010 -t 10000" + ref = "initial:default -p 12010" base = communicator.stringToProxy(ref) test(base) print "ok" @@ -174,7 +174,7 @@ def allTests(communicator, collocated): if not collocated: print "testing UnexpectedObjectException...", - ref = "uoet:default -p 12010 -t 10000" + ref = "uoet:default -p 12010" base = communicator.stringToProxy(ref) test(base) uoet = Test.UnexpectedObjectExceptionTestPrx.uncheckedCast(base) diff --git a/py/test/Ice/objects/Collocated.py b/py/test/Ice/objects/Collocated.py index 0aa2dd2ae8e..30808dcb29e 100755 --- a/py/test/Ice/objects/Collocated.py +++ b/py/test/Ice/objects/Collocated.py @@ -16,7 +16,7 @@ Ice.loadSlice('ClientPrivate.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/Server.py b/py/test/Ice/objects/Server.py index 26a577f1ba7..d2b53cde735 100755 --- a/py/test/Ice/objects/Server.py +++ b/py/test/Ice/objects/Server.py @@ -35,7 +35,7 @@ def run(args, communicator): communicator.addObjectFactory(factory, '::Test::J') communicator.addObjectFactory(factory, '::Test::H') - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") initial = TestI.InitialI(adapter) adapter.add(initial, communicator.stringToIdentity("initial")) diff --git a/py/test/Ice/objects/run.py b/py/test/Ice/objects/run.py index 545214a74c7..979b91c2544 100755 --- a/py/test/Ice/objects/run.py +++ b/py/test/Ice/objects/run.py @@ -22,3 +22,5 @@ from scripts import * TestUtil.clientServerTest() TestUtil.collocatedTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/operations/AllTests.py b/py/test/Ice/operations/AllTests.py index 83858d730c1..19152e130e5 100644 --- a/py/test/Ice/operations/AllTests.py +++ b/py/test/Ice/operations/AllTests.py @@ -14,7 +14,7 @@ def test(b): raise RuntimeError('test assertion failed') def allTests(communicator, collocated): - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) cl = Test.MyClassPrx.checkedCast(base) derived = Test.MyDerivedClassPrx.checkedCast(cl) diff --git a/py/test/Ice/operations/Collocated.py b/py/test/Ice/operations/Collocated.py index 0b23a944a8b..43a359493c2 100755 --- a/py/test/Ice/operations/Collocated.py +++ b/py/test/Ice/operations/Collocated.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/Server.py b/py/test/Ice/operations/Server.py index ecee3f2cf27..59e13d97cea 100755 --- a/py/test/Ice/operations/Server.py +++ b/py/test/Ice/operations/Server.py @@ -19,7 +19,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/ServerAMD.py b/py/test/Ice/operations/ServerAMD.py index b678605d03a..5d61282bfb5 100755 --- a/py/test/Ice/operations/ServerAMD.py +++ b/py/test/Ice/operations/ServerAMD.py @@ -210,7 +210,7 @@ class MyDerivedClassI(Test.MyDerivedClass): cb.ice_response() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/operations/Twoways.py b/py/test/Ice/operations/Twoways.py index d79bd05243e..a2c96547dd3 100644 --- a/py/test/Ice/operations/Twoways.py +++ b/py/test/Ice/operations/Twoways.py @@ -602,7 +602,7 @@ def twoways(communicator, p): # test(len(p2.opContext()) > 0) # # communicator.setDefaultContext(dflt) - # c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) + # c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) # test(c.opContext() == dflt) # # dflt['a'] = 'c' @@ -637,7 +637,7 @@ def twoways(communicator, p): ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'} - p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:default -p 12010 -t 10000')) + p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy('test:default -p 12010')) ic.getImplicitContext().setContext(ctx) test(ic.getImplicitContext().getContext() == ctx) diff --git a/py/test/Ice/operations/TwowaysAMI.py b/py/test/Ice/operations/TwowaysAMI.py index 295a2051989..b27220ede34 100644 --- a/py/test/Ice/operations/TwowaysAMI.py +++ b/py/test/Ice/operations/TwowaysAMI.py @@ -890,7 +890,7 @@ def twowaysAMI(communicator, p): # test(cb.check()) # # communicator.setDefaultContext(dflt) -# c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010 -t 10000")) +# c = Test.MyClassPrx.checkedCast(communicator.stringToProxy("test:default -p 12010")) # cb = AMI_MyClass_opContextEqualI({'a': 'b'}) # c.opContext_async(cb) # test(cb.check()) @@ -934,7 +934,7 @@ def twowaysAMI(communicator, p): ctx = {'one': 'ONE', 'two': 'TWO', 'three': 'THREE'} - p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010 -t 10000")) + p = Test.MyClassPrx.uncheckedCast(ic.stringToProxy("test:default -p 12010")) ic.getImplicitContext().setContext(ctx) test(ic.getImplicitContext().getContext() == ctx) diff --git a/py/test/Ice/operations/run.py b/py/test/Ice/operations/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/operations/run.py +++ b/py/test/Ice/operations/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/proxy/AllTests.py b/py/test/Ice/proxy/AllTests.py index e5b03b4a9e7..25416c68df6 100644 --- a/py/test/Ice/proxy/AllTests.py +++ b/py/test/Ice/proxy/AllTests.py @@ -24,7 +24,7 @@ def allTests(communicator, collocated): p = communicator.propertyToProxy('bogus') test(p == None) - ref = "test:default -p 12010 -t 10000" + ref = "test:default -p 12010" base = communicator.stringToProxy(ref) test(base) @@ -197,7 +197,7 @@ def allTests(communicator, collocated): print "testing propertyToProxy... ", prop = communicator.getProperties() propertyPrefix = "Foo.Proxy" - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") b1 = communicator.propertyToProxy(propertyPrefix) test(b1.ice_getIdentity().name == "test" and len(b1.ice_getIdentity().category) == 0 and \ len(b1.ice_getAdapterId()) == 0 and len(b1.ice_getFacet()) == 0) @@ -239,7 +239,7 @@ def allTests(communicator, collocated): #test(b1.ice_getLocatorCacheTimeout() == 60) #prop.setProperty("Ice.Default.LocatorCacheTimeout", "") - prop.setProperty(propertyPrefix, "test:default -p 12010 -t 10000") + prop.setProperty(propertyPrefix, "test:default -p 12010") property = propertyPrefix + ".Router" test(not b1.ice_getRouter()) diff --git a/py/test/Ice/proxy/Collocated.py b/py/test/Ice/proxy/Collocated.py index 0b23a944a8b..43a359493c2 100755 --- a/py/test/Ice/proxy/Collocated.py +++ b/py/test/Ice/proxy/Collocated.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI, AllTests def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/Server.py b/py/test/Ice/proxy/Server.py index 170fcd80184..9af7dec4acd 100755 --- a/py/test/Ice/proxy/Server.py +++ b/py/test/Ice/proxy/Server.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TestI.MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/ServerAMD.py b/py/test/Ice/proxy/ServerAMD.py index e50f5c63332..93839fe50f3 100755 --- a/py/test/Ice/proxy/ServerAMD.py +++ b/py/test/Ice/proxy/ServerAMD.py @@ -38,7 +38,7 @@ class MyDerivedClassI(Test.MyDerivedClass): return Test.MyDerivedClass.ice_isA(self, s, current) def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(MyDerivedClassI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Ice/proxy/run.py b/py/test/Ice/proxy/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/proxy/run.py +++ b/py/test/Ice/proxy/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/retry/AllTests.py b/py/test/Ice/retry/AllTests.py index 63f329149b5..87a40f80a61 100644 --- a/py/test/Ice/retry/AllTests.py +++ b/py/test/Ice/retry/AllTests.py @@ -60,7 +60,7 @@ class AMIException(CallbackBase): def allTests(communicator): print "testing stringToProxy...", - ref = "retry:default -p 12010 -t 10000" + ref = "retry:default -p 12010" base1 = communicator.stringToProxy(ref) test(base1) base2 = communicator.stringToProxy(ref) diff --git a/py/test/Ice/retry/Server.py b/py/test/Ice/retry/Server.py index ad977b666d5..66b325a1013 100755 --- a/py/test/Ice/retry/Server.py +++ b/py/test/Ice/retry/Server.py @@ -20,7 +20,7 @@ Ice.loadSlice('-I' + slice_dir + ' Test.ice') import Test, TestI def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") id = communicator.stringToIdentity("retry") adapter.add(TestI.RetryI(), id) diff --git a/py/test/Ice/retry/run.py b/py/test/Ice/retry/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/retry/run.py +++ b/py/test/Ice/retry/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Ice/servantLocator/AllTests.py b/py/test/Ice/servantLocator/AllTests.py index 212c879f2fe..1a9039cf422 100644 --- a/py/test/Ice/servantLocator/AllTests.py +++ b/py/test/Ice/servantLocator/AllTests.py @@ -123,7 +123,7 @@ def testExceptions(obj, collocated): def allTests(communicator, collocated): print "testing stringToProxy...", sys.stdout.flush() - base = communicator.stringToProxy("asm:default -p 12010 -t 10000") + base = communicator.stringToProxy("asm:default -p 12010") test(base) print "ok" @@ -137,7 +137,7 @@ def allTests(communicator, collocated): print "testing ice_ids...", sys.stdout.flush() try: - obj = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + obj = communicator.stringToProxy("category/locate:default -p 12010") obj.ice_ids() test(False) except Ice.UnknownUserException, ex: @@ -146,7 +146,7 @@ def allTests(communicator, collocated): test(False) try: - obj = communicator.stringToProxy("category/finished:default -p 12010 -t 10000") + obj = communicator.stringToProxy("category/finished:default -p 12010") obj.ice_ids() test(False) except Ice.UnknownUserException, ex: @@ -157,40 +157,40 @@ def allTests(communicator, collocated): print "testing servant locator...", sys.stdout.flush() - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("category/unknown:default -p 12010")) except Ice.ObjectNotExistException: pass print "ok" print "testing default servant locator...", sys.stdout.flush() - base = communicator.stringToProxy("anothercat/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("anothercat/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) - base = communicator.stringToProxy("locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("anothercat/unknown:default -p 12010")) except Ice.ObjectNotExistException: pass try: - Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010 -t 10000")) + Test.TestIntfPrx.checkedCast(communicator.stringToProxy("unknown:default -p 12010")) except Ice.ObjectNotExistException: pass print "ok" print "testing locate exceptions...", sys.stdout.flush() - base = communicator.stringToProxy("category/locate:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/locate:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) testExceptions(obj, collocated) print "ok" print "testing finished exceptions...", sys.stdout.flush() - base = communicator.stringToProxy("category/finished:default -p 12010 -t 10000") + base = communicator.stringToProxy("category/finished:default -p 12010") obj = Test.TestIntfPrx.checkedCast(base) testExceptions(obj, collocated) print "ok" diff --git a/py/test/Ice/servantLocator/Collocated.py b/py/test/Ice/servantLocator/Collocated.py index 014d8dac39a..9e996f50732 100755 --- a/py/test/Ice/servantLocator/Collocated.py +++ b/py/test/Ice/servantLocator/Collocated.py @@ -16,7 +16,7 @@ import Test, TestI, AllTests class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/Server.py b/py/test/Ice/servantLocator/Server.py index ad1108f64ae..091db0eb4fc 100755 --- a/py/test/Ice/servantLocator/Server.py +++ b/py/test/Ice/servantLocator/Server.py @@ -16,7 +16,7 @@ import Test, TestI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/ServerAMD.py b/py/test/Ice/servantLocator/ServerAMD.py index 3767c1f9579..e322497718f 100755 --- a/py/test/Ice/servantLocator/ServerAMD.py +++ b/py/test/Ice/servantLocator/ServerAMD.py @@ -16,7 +16,7 @@ import Test, TestAMDI class TestServer(Ice.Application): def run(self, args): - self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000") + self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010") self.communicator().getProperties().setProperty("Ice.Warn.Dispatch", "0") adapter = self.communicator().createObjectAdapter("TestAdapter") diff --git a/py/test/Ice/servantLocator/run.py b/py/test/Ice/servantLocator/run.py index 8356ffd9740..86c5472a10a 100755 --- a/py/test/Ice/servantLocator/run.py +++ b/py/test/Ice/servantLocator/run.py @@ -26,3 +26,5 @@ print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") print "tests with collocated server." TestUtil.collocatedTest(" --Ice.ThreadPool.Client.SizeMax=2 --Ice.ThreadPool.Client.SizeWarn=0") + +TestUtil.cleanup() diff --git a/py/test/Ice/slicing/exceptions/run.py b/py/test/Ice/slicing/exceptions/run.py index a837100e45f..03ccd381247 100755 --- a/py/test/Ice/slicing/exceptions/run.py +++ b/py/test/Ice/slicing/exceptions/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") + +TestUtil.cleanup() diff --git a/py/test/Ice/slicing/objects/run.py b/py/test/Ice/slicing/objects/run.py index a837100e45f..03ccd381247 100755 --- a/py/test/Ice/slicing/objects/run.py +++ b/py/test/Ice/slicing/objects/run.py @@ -24,3 +24,5 @@ print "tests with regular server." TestUtil.clientServerTest() print "tests with AMD server." TestUtil.clientServerTest(server="ServerAMD.py") + +TestUtil.cleanup() diff --git a/py/test/Ice/timeout/AllTests.py b/py/test/Ice/timeout/AllTests.py index 6e5601ea007..7150720a524 100644 --- a/py/test/Ice/timeout/AllTests.py +++ b/py/test/Ice/timeout/AllTests.py @@ -62,7 +62,7 @@ class AMISleepEx(CallbackBase): self.called() def allTests(communicator, collocated): - sref = "timeout:default -p 12010 -t 10000" + sref = "timeout:default -p 12010" obj = communicator.stringToProxy(sref) test(obj != None) diff --git a/py/test/Ice/timeout/Server.py b/py/test/Ice/timeout/Server.py index 5868c284f94..791f7af6e89 100755 --- a/py/test/Ice/timeout/Server.py +++ b/py/test/Ice/timeout/Server.py @@ -49,7 +49,7 @@ class TimeoutI(Test.Timeout): current.adapter.getCommunicator().shutdown() def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(TimeoutI(), communicator.stringToIdentity("timeout")) adapter.activate() diff --git a/py/test/Ice/timeout/run.py b/py/test/Ice/timeout/run.py index bb34e7d35b7..56d48e628de 100755 --- a/py/test/Ice/timeout/run.py +++ b/py/test/Ice/timeout/run.py @@ -21,3 +21,5 @@ sys.path.append(os.path.join(path[0])) from scripts import * TestUtil.clientServerTest() + +TestUtil.cleanup() diff --git a/py/test/Slice/keyword/Client.py b/py/test/Slice/keyword/Client.py index 97d9c4cb81d..61b2b1ab229 100755 --- a/py/test/Slice/keyword/Client.py +++ b/py/test/Slice/keyword/Client.py @@ -76,7 +76,7 @@ def testtypes(): print "ok" def run(args, communicator): - communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000:udp") + communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010:udp") adapter = communicator.createObjectAdapter("TestAdapter") adapter.add(execI(), communicator.stringToIdentity("test")) adapter.activate() diff --git a/py/test/Slice/keyword/run.py b/py/test/Slice/keyword/run.py index 6722947e90c..1e5f898cd6c 100755 --- a/py/test/Slice/keyword/run.py +++ b/py/test/Slice/keyword/run.py @@ -25,3 +25,5 @@ clientProc = TestUtil.startClient("Client.py", "--Ice.Default.Host=127.0.0.1", s print "ok" clientProc.startReader() clientProc.waitTestSuccess() + +TestUtil.cleanup() |