Python test suite updates

1 files changed, 14 insertions, 15 deletions

diff --git a/python/test/Ice/adapterDeactivation/Collocated.py b/python/test/Ice/adapterDeactivation/Collocated.py
index aead96a58e5..edede9c1301 100755
--- a/python/test/Ice/adapterDeactivation/Collocated.py
+++ b/python/test/Ice/adapterDeactivation/Collocated.py
@@ -8,25 +8,24 @@
 #
 # **********************************************************************
 
-import os, sys, traceback, time
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import AllTests
+import TestI
 
-import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests
 
-class TestServer(Ice.Application):
+class Collocated(TestHelper):
+
     def run(self, args):
-        self.communicator().getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-        adapter = self.communicator().createObjectAdapter("TestAdapter")
-        locator = TestI.ServantLocatorI()
 
-        adapter.addServantLocator(locator, "")
-        #adapter.activate() // Don't activate OA to ensure collocation is used.
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            locator = TestI.ServantLocatorI()
 
-        AllTests.allTests(self.communicator())
+            adapter.addServantLocator(locator, "")
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
 
-        adapter.waitForDeactivate()
-        return 0
+            AllTests.allTests(self, communicator)
 
-app = TestServer()
-sys.exit(app.main(sys.argv))
+            adapter.waitForDeactivate()