Python test suite updates

3 files changed, 27 insertions, 58 deletions

diff --git a/python/test/Ice/acm/AllTests.py b/python/test/Ice/acm/AllTests.py
index 29d3209b650..7d61d21147e 100644
--- a/python/test/Ice/acm/AllTests.py
+++ b/python/test/Ice/acm/AllTests.py
@@ -150,8 +150,8 @@ class TestCase(threading.Thread):
         self._serverACMClose = close
         self._serverACMHeartbeat = heartbeat
 
-def allTests(communicator):
-    ref = "communicator:default -p 12010"
+def allTests(helper, communicator):
+    ref = "communicator:{0}".format(helper.getTestEndpoint(num=0))
     com = Test.RemoteCommunicatorPrx.uncheckedCast(communicator.stringToProxy(ref))
 
     tests = []
diff --git a/python/test/Ice/acm/Client.py b/python/test/Ice/acm/Client.py
index cd122cbd94a..637f7b7eb22 100755
--- a/python/test/Ice/acm/Client.py
+++ b/python/test/Ice/acm/Client.py
@@ -8,34 +8,15 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
-import Ice
-
-import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
-
-Ice.loadSlice("'-I" + slice_dir + "' Test.ice")
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
 import AllTests
 
-def test(b):
-    if not b:
-        raise RuntimeError('test assertion failed')
-
-def run(args, communicator):
-    AllTests.allTests(communicator)
-    return True
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty('Ice.Warn.Connections', '0')
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+class Client(TestHelper):
 
-sys.exit(not status)
+    def run(self, args):
+        properties = self.createTestProperties(args)
+        properties.setProperty('Ice.Warn.Connections', '0')
+        with self.initialize(properties=properties) as communicator:
+            AllTests.allTests(self, communicator)
diff --git a/python/test/Ice/acm/Server.py b/python/test/Ice/acm/Server.py
index 792bc0a8c1f..fe276128ffc 100755
--- a/python/test/Ice/acm/Server.py
+++ b/python/test/Ice/acm/Server.py
@@ -8,39 +8,27 @@
 #
 # **********************************************************************
 
-import os, sys, traceback
 import Ice
-slice_dir = Ice.getSliceDir()
-if not slice_dir:
-    print(sys.argv[0] + ': Slice directory not found.')
-    sys.exit(1)
+from TestHelper import TestHelper
+TestHelper.loadSlice("Test.ice")
+import TestI
 
-Ice.loadSlice('"-I' + slice_dir + '" Test.ice')
-import Test, TestI
 
-def run(args, communicator):
-    communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
-    communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0")
-    adapter = communicator.createObjectAdapter("TestAdapter")
-    id = Ice.stringToIdentity("communicator")
-    adapter.add(TestI.RemoteCommunicatorI(), id)
-    adapter.activate()
+class Server(TestHelper):
 
-    # Disable ready print for further adapters.
-    communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0")
+    def run(self, args):
 
-    communicator.waitForShutdown()
-    return True
+        properties = self.createTestProperties(args)
+        properties.setProperty("Ice.Warn.Connections", "0")
+        properties.setProperty("Ice.ACM.Timeout", "1")
+        with self.initialize(properties=properties) as communicator:
+            communicator.getProperties().setProperty("TestAdapter.Endpoints", "default -p 12010")
+            communicator.getProperties().setProperty("TestAdapter.ACM.Timeout", "0")
+            adapter = communicator.createObjectAdapter("TestAdapter")
+            adapter.add(TestI.RemoteCommunicatorI(), Ice.stringToIdentity("communicator"))
+            adapter.activate()
 
-try:
-    initData = Ice.InitializationData()
-    initData.properties = Ice.createProperties(sys.argv)
-    initData.properties.setProperty("Ice.Warn.Connections", "0");
-    initData.properties.setProperty("Ice.ACM.Timeout", "1");
-    with Ice.initialize(sys.argv, initData) as communicator:
-        status = run(sys.argv, communicator)
-except:
-    traceback.print_exc()
-    status = False
+            # Disable ready print for further adapters.
+            communicator.getProperties().setProperty("Ice.PrintAdapterReady", "0")
 
-sys.exit(not status)
+            communicator.waitForShutdown()