Python test suite updates

1 files changed, 15 insertions, 24 deletions

diff --git a/python/test/Ice/facets/Collocated.py b/python/test/Ice/facets/Collocated.py
index b5d2481b7b1..78c097a9fbf 100755
--- a/python/test/Ice/facets/Collocated.py
+++ b/python/test/Ice/facets/Collocated.py
@@ -8,34 +8,25 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
-
 import Ice
-Ice.loadSlice('Test.ice')
-import Test, TestI, AllTests
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
+import AllTests
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    d = TestI.DI()
-    adapter.add(d, Ice.stringToIdentity("d"))
-    adapter.addFacet(d, Ice.stringToIdentity("d"), "facetABCD")
-    f = TestI.FI()
-    adapter.addFacet(f, Ice.stringToIdentity("d"), "facetEF")
-    h = TestI.HI(communicator)
-    adapter.addFacet(h, Ice.stringToIdentity("d"), "facetGH")
 
-    #adapter.activate() // Don't activate OA to ensure collocation is used.
+class Collocated(TestHelper):
 
-    AllTests.allTests(communicator)
+    def run(self, args):
 
-    return True
+        with self.initialize(args=args) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", self.getTestEndpoint())
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.DI(), Ice.stringToIdentity("d"))
+            adapter.addFacet(TestI.DI(), Ice.stringToIdentity("d"), "facetABCD")
+            adapter.addFacet(TestI.FI(), Ice.stringToIdentity("d"), "facetEF")
+            adapter.addFacet(TestI.HI(communicator), Ice.stringToIdentity("d"), "facetGH")
 
-try:
-    with Ice.initialize(sys.argv) as communicator:
-         status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            # adapter.activate() // Don't activate OA to ensure collocation is used.
 
-sys.exit(not status)
+            AllTests.allTests(self, communicator)