diff options
| author | Jose <jose@zeroc.com> | 2014-12-05 11:50:45 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2014-12-05 11:50:45 +0100 |
| commit | 8f50c530c81d20bd01b6ef65622cab8b51be7636 (patch) | |
| tree | 3569639712dced86c2e880ab3a4b127c1d4087b2 /scripts/TestUtil.py | |
| parent | Don't test C# on non-default arch with VC110 (diff) | |
| download | ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.tar.bz2 ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.tar.xz ice-8f50c530c81d20bd01b6ef65622cab8b51be7636.zip | |
IceStorm & TestUtil scripts timeout fixes
Diffstat (limited to 'scripts/TestUtil.py')
| -rwxr-xr-x | scripts/TestUtil.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/TestUtil.py b/scripts/TestUtil.py index 62bdce5fb15..5665dc9c066 100755 --- a/scripts/TestUtil.py +++ b/scripts/TestUtil.py @@ -1241,7 +1241,7 @@ def spawnClient(cmd, env=None, cwd=None, echo=True, startReader=True, lang=None) client.trace() return client -def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None, mx=False, timeout=20): +def spawnServer(cmd, env=None, cwd=None, count=1, adapter=None, echo=True, lang=None, mx=False, timeout=60): server = _spawn(cmd, env, cwd, lang=lang) # Count + 1 if IceMX enabled @@ -1638,7 +1638,7 @@ def startClient(exe, args = "", config=None, env=None, echo = True, startReader phpSetup(clientConfig, iceOptions, iceProfile) return spawnClient(cmd, env = env, echo = echo, startReader = startReader, lang=config.lang) -def startServer(exe, args = "", config = None, env = None, adapter = None, count = 1, echo = True, timeout = 20): +def startServer(exe, args = "", config = None, env = None, adapter = None, count = 1, echo = True, timeout = 60): if config is None: config = DriverConfig("server") if env is None: |