1 files changed, 3 insertions, 52 deletions
diff --git a/cpp/test/IceGrid/activation/run.py b/cpp/test/IceGrid/activation/run.py
index 6a798035464..c2f76f66645 100755
--- a/cpp/test/IceGrid/activation/run.py
+++ b/cpp/test/IceGrid/activation/run.py
@@ -22,56 +22,7 @@ import TestUtil
 import IceGridAdmin
 
 name = os.path.join("IceGrid", "activation")
-testdir = os.path.join(toplevel, "test", name)
 
-#
-# Add locator options for the client and server. Since the server
-# invokes on the locator it's also considered to be a client.
-#
-additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\""
-
-IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-
-#
-# Start IceGrid registry and a node.
-#
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
-iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
-
-#
-# Test client/server with on demand activation.
-#
-server = os.path.join(testdir, "server")
-client = os.path.join(testdir, "client")
-
-print "registering server with icegrid...",
-IceGridAdmin.addApplication(os.path.join(testdir, "application.xml"),
-                            "test.dir=" + testdir + " ice.dir=" + toplevel + \
-                            " \\\"properties-override=" + TestUtil.clientServerOptions.replace("--", "") + "\\\"")
-IceGridAdmin.startServer("node-1")
-IceGridAdmin.startServer("node-2")
-print "ok"
-  
-print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientOptions + additionalOptions + " --with-deploy" + " 2>&1")
-print "ok"
-
-TestUtil.printOutputFromPipe(clientPipe)
-    
-clientStatus = TestUtil.closePipe(clientPipe)
-    
-print "unregister server with icegrid...",
-IceGridAdmin.stopServer("node-1")
-IceGridAdmin.stopServer("node-2")
-IceGridAdmin.removeApplication("Test")
-print "ok"
-
-IceGridAdmin.shutdownIceGridNode()
-iceGridNodeThread.join()
-IceGridAdmin.shutdownIceGridRegistry()
-iceGridRegistryThread.join()
-
-if clientStatus:
-    sys.exit(1)
-else:
-    sys.exit(0)
+IceGridAdmin.iceGridTest(name, "application.xml", "", \
+                         ' \\"properties-override=' + TestUtil.clientServerOptions.replace("--", "") + '\\"')
+sys.exit(0)