summaryrefslogtreecommitdiff
path: root/cpp/test/IceGrid/fileLock/test.py
diff options
context:
space:
mode:
authorJose <jose@zeroc.com>2019-07-18 23:51:08 +0200
committerJose <jose@zeroc.com>2019-07-18 23:51:08 +0200
commitfc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch)
tree51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /cpp/test/IceGrid/fileLock/test.py
parentSimplify OutputStream creation (diff)
parentFixed non-thread safe AMD dispatch, fixes #448 (#449) (diff)
downloadice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2
ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz
ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'cpp/test/IceGrid/fileLock/test.py')
-rw-r--r--cpp/test/IceGrid/fileLock/test.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/cpp/test/IceGrid/fileLock/test.py b/cpp/test/IceGrid/fileLock/test.py
index 3a0cd85cbec..11055392cad 100644
--- a/cpp/test/IceGrid/fileLock/test.py
+++ b/cpp/test/IceGrid/fileLock/test.py
@@ -8,7 +8,7 @@ class IceGridAdminTestCase(IceGridTestCase):
def runClientSide(self, current):
sys.stdout.write("testing IceGrid file lock... ")
- registry = IceGridRegistryMaster(portnum=25, readyCount=0, quiet=True);
+ registry = IceGridRegistryMaster(portnum=25, ready="", quiet=True);
registry.start(current)
registry.expect(current, ".*IceUtil::FileLockException.*")
registry.stop(current, False)