summaryrefslogtreecommitdiff
path: root/scripts/Controller.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2016-12-16 15:56:18 +0100
committerBenoit Foucher <benoit@zeroc.com>2016-12-16 15:56:18 +0100
commit66e63999fd121114d27842f1bf3cd2121ccf320c (patch)
treecf20b42e13a4899f2182acc9a572cbae43987358 /scripts/Controller.py
parentRemove unused Makefile (diff)
downloadice-66e63999fd121114d27842f1bf3cd2121ccf320c.tar.bz2
ice-66e63999fd121114d27842f1bf3cd2121ccf320c.tar.xz
ice-66e63999fd121114d27842f1bf3cd2121ccf320c.zip
Added support for Objective-C controller
Diffstat (limited to 'scripts/Controller.py')
-rwxr-xr-xscripts/Controller.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Controller.py b/scripts/Controller.py
index 806c00802eb..7cc938e48bd 100755
--- a/scripts/Controller.py
+++ b/scripts/Controller.py
@@ -90,10 +90,10 @@ class ControllerDriver(Driver):
def startServerSide(self, config, c):
self.updateCurrent(config)
try:
- self.current.serverTestCase._startServerSide(self.current)
self.serverSideRunning = True
- return self.current.host
+ return self.current.serverTestCase._startServerSide(self.current)
except Exception as ex:
+ self.serverSideRunning = False
raise Test.Common.TestCaseFailedException(self.current.result.getOutput() + "\n" + str(ex))
def stopServerSide(self, success, c):
@@ -121,7 +121,7 @@ class ControllerDriver(Driver):
c.adapter.remove(c.id)
def updateCurrent(self, config):
- attrs = ["protocol", "mx", "serialize", "compress", "ipv6"]
+ attrs = ["protocol", "mx", "serialize", "compress", "ipv6", "cprops", "sprops"]
for a in attrs:
v = getattr(config, a)
if v is not Ice.Unset: