summaryrefslogtreecommitdiff
path: root/scripts/IceStormUtil.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/IceStormUtil.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/IceStormUtil.py')
-rw-r--r--scripts/IceStormUtil.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/IceStormUtil.py b/scripts/IceStormUtil.py
index 79b31006e1f..ae38e14480c 100644
--- a/scripts/IceStormUtil.py
+++ b/scripts/IceStormUtil.py
@@ -204,7 +204,7 @@ class IceStormTestCase(TestCase):
def runadmin(self, current, cmd, instanceName=None, instance=None, exitstatus=0, quiet=False):
admin = IceStormAdmin(instanceName, instance, args=["-e", cmd], quiet=quiet)
admin.run(current, exitstatus=exitstatus)
- return admin.getOutput()
+ return admin.getOutput(current)
def getTopicManager(self, current, instanceName=None):
if not instanceName: