Refactored test scripts

3 files changed, 16 insertions, 31 deletions

diff --git a/cpp/test/Ice/echo/Server.cpp b/cpp/test/Ice/echo/Server.cpp
index 9d80f8833a9..397509df120 100644
--- a/cpp/test/Ice/echo/Server.cpp
+++ b/cpp/test/Ice/echo/Server.cpp
@@ -69,8 +69,7 @@ main(int argc, char* argv[])
 
     try
     {
-        Ice::InitializationData initData;
-        initData.properties = Ice::createProperties(argc, argv);
+        Ice::InitializationData initData = getTestInitData(argc, argv);
         communicator = Ice::initialize(argc, argv, initData);
         status = run(argc, argv, communicator);
     }
diff --git a/cpp/test/Ice/echo/run.py b/cpp/test/Ice/echo/run.py
deleted file mode 100755
index 2f0c3b6439d..00000000000
--- a/cpp/test/Ice/echo/run.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env python
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
-#
-# This copy of Ice is licensed to you under the terms described in the
-# ICE_LICENSE file included in this distribution.
-#
-# **********************************************************************
-
-import os, sys
-
-path = [ ".", "..", "../..", "../../..", "../../../..", "../../../../.." ]
-head = os.path.dirname(sys.argv[0])
-if len(head) > 0:
-    path = [os.path.join(head, p) for p in path]
-path = [os.path.abspath(p) for p in path if os.path.exists(os.path.join(p, "scripts", "TestUtil.py")) ]
-if len(path) == 0:
-    raise RuntimeError("can't find toplevel directory!")
-sys.path.append(os.path.join(path[0], "scripts"))
-import TestUtil
-
-sys.stdout.write("starting server... ")
-sys.stdout.flush()
-server = server = os.path.join(os.getcwd(), TestUtil.getTestExecutable("server"))
-p = TestUtil.startServer(server)
-print("ok")
-sys.stdout.flush()
-p.waitTestSuccess()
diff --git a/cpp/test/Ice/echo/test.py b/cpp/test/Ice/echo/test.py
new file mode 100644
index 00000000000..27ced12e84c
--- /dev/null
+++ b/cpp/test/Ice/echo/test.py
@@ -0,0 +1,15 @@
+# **********************************************************************
+#
+# Copyright (c) 2003-2016 ZeroC, Inc. All rights reserved.
+#
+# This copy of Ice is licensed to you under the terms described in the
+# ICE_LICENSE file included in this distribution.
+#
+# **********************************************************************
+
+class EchoServerTestCase(ClientServerTestCase):
+
+    def runClientSide(self, current):
+        pass
+
+TestSuite(__name__, [EchoServerTestCase(name="server", server=Server(waitForShutdown=False))])