Fixed IceGrid python scripts

1 files changed, 3 insertions, 39 deletions

diff --git a/cpp/test/IceGrid/replication/run.py b/cpp/test/IceGrid/replication/run.py
index 02c2bf1e3b7..e6b53250a08 100755
--- a/cpp/test/IceGrid/replication/run.py
+++ b/cpp/test/IceGrid/replication/run.py
@@ -23,7 +23,6 @@ import IceGridAdmin
 
 name = os.path.join("IceGrid", "replication")
 testdir = os.path.join(toplevel, "test", name)
-client = os.path.join(testdir, "client")
 
 if TestUtil.isWin32():
     os.environ["PATH"] = testdir + ";" + os.getenv("PATH", "")
@@ -33,11 +32,6 @@ else:
     os.environ["LD_LIBRARY_PATH"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH", "")
     os.environ["LD_LIBRARY_PATH_64"] = testdir + ":" + os.getenv("LD_LIBRARY_PATH_64", "")
 
-if TestUtil.isWin32() and os.path.exists(os.path.join(toplevel, "bin", "iceboxd.exe")):
-    iceBox = os.path.join(toplevel, "bin", "iceboxd")
-else:
-    iceBox = os.path.join(toplevel, "bin", "icebox")
-
 #
 # Add locator options for the client and server. Since the server
 # invokes on the locator it's also considered to be a client.
@@ -51,36 +45,6 @@ else:
 additionalOptions = " --Ice.Default.Locator=\"IceGrid/Locator:default -p 12010\"" + \
                     " --Ice.PrintAdapterReady=0 --Ice.PrintProcessId=0 --Ice.RetryIntervals=\"0 50 100 250\""
 
-IceGridAdmin.cleanDbDir(os.path.join(testdir, "db"))
-iceGridRegistryThread = IceGridAdmin.startIceGridRegistry("12010", testdir, 0)
-iceGridNodeThread = IceGridAdmin.startIceGridNode(testdir)
-
-print "registering application with icegrid...",
-IceGridAdmin.addApplication(os.path.join(testdir, "application.xml"),
-                            "ice.dir=" + toplevel + " " + "test.dir=" + testdir + " icebox.exe=" + iceBox)
-print "ok"
-
-print "starting client...",
-clientPipe = os.popen(client + TestUtil.clientServerOptions + additionalOptions + " 2>&1")
-print "ok"
-
-try:
-    TestUtil.printOutputFromPipe(clientPipe)
-except:
-    pass
-    
-clientStatus = TestUtil.closePipe(clientPipe)
-
-print "unregister application with icegrid...",
-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", "--Ice.RetryIntervals=\"0 50 100 250\"", \
+                         "icebox.exe=" + TestUtil.getIceBox(testdir))
+sys.exit(0)