summaryrefslogtreecommitdiff
path: root/scripts/LocalDriver.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-27 12:32:00 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-27 12:32:00 +0100
commit876bb37a664f07c2ff40cf20aca99a24cb577448 (patch)
tree6faf52a907d02cbf87a1bafcef851a0be33d6aec /scripts/LocalDriver.py
parentDisable PHP namespaces with travis builds (diff)
downloadice-876bb37a664f07c2ff40cf20aca99a24cb577448.tar.bz2
ice-876bb37a664f07c2ff40cf20aca99a24cb577448.tar.xz
ice-876bb37a664f07c2ff40cf20aca99a24cb577448.zip
Fixed Python controller dispatch interfaces
Diffstat (limited to 'scripts/LocalDriver.py')
-rw-r--r--scripts/LocalDriver.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/scripts/LocalDriver.py b/scripts/LocalDriver.py
index 5a134ad1939..921d76b925f 100644
--- a/scripts/LocalDriver.py
+++ b/scripts/LocalDriver.py
@@ -340,18 +340,14 @@ class LocalDriver(Driver):
self.results = []
self.threadlocal = threading.local()
- try:
- if self.clientCtlPrx or self.serverCtlPrx:
- self.initCommunicator()
- self.runner = RemoteTestCaseRunner(self.communicator, self.clientCtlPrx, self.serverCtlPrx)
- else:
- self.runner = TestCaseRunner()
- except:
- self.destroy()
- raise
-
def run(self, mappings, testSuiteIds):
+ if self.clientCtlPrx or self.serverCtlPrx:
+ self.initCommunicator()
+ self.runner = RemoteTestCaseRunner(self.communicator, self.clientCtlPrx, self.serverCtlPrx)
+ else:
+ self.runner = TestCaseRunner()
+
while True:
executor = Executor(self.threadlocal, self.workers, self.continueOnFailure)
for mapping in mappings: