diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-12-27 10:04:32 +0100 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-12-27 10:04:32 +0100 |
| commit | ad93d22f86405cf5df313b7fe4169953ae0fabc2 (patch) | |
| tree | 9310edaa76f857c744f2348a4bb92dd46323168d /scripts/Util.py | |
| parent | _MSC_VER not defined by ResourceCompiler (diff) | |
| download | ice-ad93d22f86405cf5df313b7fe4169953ae0fabc2.tar.bz2 ice-ad93d22f86405cf5df313b7fe4169953ae0fabc2.tar.xz ice-ad93d22f86405cf5df313b7fe4169953ae0fabc2.zip | |
Bumped timeout for server shutdown
Diffstat (limited to 'scripts/Util.py')
| -rw-r--r-- | scripts/Util.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/Util.py b/scripts/Util.py index 4942ee560e4..34c9a5e913c 100644 --- a/scripts/Util.py +++ b/scripts/Util.py @@ -1048,7 +1048,7 @@ class Process(Runnable): if self.process: try: if waitSuccess: # Wait for the process to exit successfully by itself. - self.process.waitSuccess(exitstatus=exitstatus, timeout=30) + self.process.waitSuccess(exitstatus=exitstatus, timeout=60) finally: self.process.terminate() self.output = self.process.getOutput() @@ -2073,7 +2073,7 @@ class BrowserProcessController(RemoteProcessController): self.httpServer = Expect.Expect(cmd, cwd=cwd) self.httpServer.expect("listening on ports") except: - self.destroy() + self.destroy(current.driver) raise def __str__(self): |