diff options
Diffstat (limited to 'python/test/Ice/faultTolerance')
-rwxr-xr-x | python/test/Ice/faultTolerance/Client.py | 4 | ||||
-rwxr-xr-x | python/test/Ice/faultTolerance/Server.py | 2 | ||||
-rwxr-xr-x | python/test/Ice/faultTolerance/run.py | 47 |
3 files changed, 3 insertions, 50 deletions
diff --git a/python/test/Ice/faultTolerance/Client.py b/python/test/Ice/faultTolerance/Client.py index 20cf85a1c72..8c5b02bdebc 100755 --- a/python/test/Ice/faultTolerance/Client.py +++ b/python/test/Ice/faultTolerance/Client.py @@ -27,7 +27,7 @@ def run(args, communicator): usage(args[0]) return False - ports.append(int(arg)) + ports.append(12010 + int(arg)) if len(ports) == 0: sys.stderr.write(args[0] + ": no ports specified\n") @@ -45,7 +45,7 @@ def run(args, communicator): try: initData = Ice.InitializationData() initData.properties = Ice.createProperties(sys.argv) - + # # This test aborts servers, so we don't want warnings. # diff --git a/python/test/Ice/faultTolerance/Server.py b/python/test/Ice/faultTolerance/Server.py index fd9b0f4096c..e0f0a1e4cdc 100755 --- a/python/test/Ice/faultTolerance/Server.py +++ b/python/test/Ice/faultTolerance/Server.py @@ -43,7 +43,7 @@ def run(args, communicator): usage(args[0]) return False - port = int(arg) + port = 12010 + int(arg) if port <= 0: sys.stderr.write(args[0] + ": no port specified\n") diff --git a/python/test/Ice/faultTolerance/run.py b/python/test/Ice/faultTolerance/run.py deleted file mode 100755 index 57213369c73..00000000000 --- a/python/test/Ice/faultTolerance/run.py +++ /dev/null @@ -1,47 +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 - -server = os.path.join(os.getcwd(), "Server.py") -client = os.path.join(os.getcwd(), "Client.py") - -num = 12 -base = 12340 - -serverProc = [] -for i in range(0, num): - sys.stdout.write("starting server #%d... " % (i + 1)) - sys.stdout.flush() - serverProc.append(TestUtil.startServer(server, "%d" % (base + i))) - print("ok") - -ports = "" -for i in range(0, num): - ports = "%s %d" % (ports, base + i) -sys.stdout.write("starting client... ") -sys.stdout.flush() -clientProc = TestUtil.startClient(client, ports, startReader = False) -print("ok") -clientProc.startReader() - -clientProc.waitTestSuccess() -for p in serverProc: - p.waitTestSuccess() |