summaryrefslogtreecommitdiff
path: root/scripts/IceGridUtil.py
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-05 12:17:23 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-05 12:17:23 +0100
commit3cbf6bc85466e5a4aa1be504e6e67eaa8bf0f186 (patch)
treeb710c6b76aff8a67a95425894f7796b8f58d3657 /scripts/IceGridUtil.py
parentAdded workaround for running Safari tests with Jenkins (diff)
downloadice-3cbf6bc85466e5a4aa1be504e6e67eaa8bf0f186.tar.bz2
ice-3cbf6bc85466e5a4aa1be504e6e67eaa8bf0f186.tar.xz
ice-3cbf6bc85466e5a4aa1be504e6e67eaa8bf0f186.zip
Thread safety fixes for tests scripts
Diffstat (limited to 'scripts/IceGridUtil.py')
-rw-r--r--scripts/IceGridUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/IceGridUtil.py b/scripts/IceGridUtil.py
index bf5df85d50a..29e63e847de 100644
--- a/scripts/IceGridUtil.py
+++ b/scripts/IceGridUtil.py
@@ -259,7 +259,7 @@ class IceGridTestCase(TestCase):
def runadmin(self, current, cmd, replica="Master", exitstatus=0, quiet=False):
admin = IceGridAdmin(args=["-r", replica, "-e", cmd], replica=replica, quiet=quiet)
admin.run(current, exitstatus=exitstatus)
- return admin.getOutput()
+ return admin.getOutput(current)
def runWithDriver(self, current):
current.driver.runClientServerTestCase(current)