diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2006-06-08 18:41:00 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2006-06-08 18:41:00 +0000 |
| commit | 04dc6ede447b97084cc6da0be55484045037dc57 (patch) | |
| tree | 180e6aa014b5b8096f6d44c9cb5ddfd2c93abf38 /java/test/Ice/exceptions/run.py | |
| parent | removing non 1.1 solution from 1.1 file list (diff) | |
| download | ice-04dc6ede447b97084cc6da0be55484045037dc57.tar.bz2 ice-04dc6ede447b97084cc6da0be55484045037dc57.tar.xz ice-04dc6ede447b97084cc6da0be55484045037dc57.zip | |
updated test suites. Minor refactor to the TrustManager.
Diffstat (limited to 'java/test/Ice/exceptions/run.py')
| -rwxr-xr-x | java/test/Ice/exceptions/run.py | 24 |
1 files changed, 4 insertions, 20 deletions
diff --git a/java/test/Ice/exceptions/run.py b/java/test/Ice/exceptions/run.py index 76d5992f43d..246f37b934c 100755 --- a/java/test/Ice/exceptions/run.py +++ b/java/test/Ice/exceptions/run.py @@ -28,28 +28,12 @@ testdirAMD = os.path.join(toplevel, "test", nameAMD) print "tests with regular server." classpath = os.getenv("CLASSPATH", "") os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath -TestUtil.clientServerTestWithOptions("", " --Ice.Warn.Connections=0") +TestUtil.clientServerTest() print "tests with AMD server." -server = "java -ea Server --Ice.ProgramName=Server " -client = "java -ea Client --Ice.ProgramName=Client " -print "starting server...", -classpath = os.getenv("CLASSPATH", "") -os.environ["CLASSPATH"] = os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath -serverPipe = os.popen(server + TestUtil.serverOptions + " 2>&1") -TestUtil.getAdapterReady(serverPipe) -print "ok" -print "starting client...", -classpath = os.getenv("CLASSPATH", "") -os.environ["CLASSPATH"] = os.path.join(testdir, "classes") + TestUtil.sep + classpath -(clientPipeIn, clientPipe) = os.popen4(client + TestUtil.clientOptions + " --Ice.Warn.Connections=0") -print "ok" -TestUtil.printOutputFromPipe(clientPipe) -clientStatus = TestUtil.closePipe(clientPipe) -serverStatus = TestUtil.closePipe(serverPipe) -if clientStatus or serverStatus: - TestUtil.killServers() - sys.exit(1) +TestUtil.clientServerTestWithClasspath(\ + os.path.join(testdirAMD, "classes") + TestUtil.sep + classpath, \ + os.path.join(testdir, "classes") + TestUtil.sep + classpath) print "tests with collocated server." TestUtil.collocatedTest() |