Mercurial > hg
comparison tests/run-tests.py @ 19438:e8bcd7b0a653
run-tests: revert previous commit, run() waits after a timeout
| author | Brendan Cully <brendan@kublai.com> |
|---|---|
| date | Thu, 18 Jul 2013 09:42:44 -0700 |
| parents | 6857f554ae0e |
| children | d876c82f25a3 |
comparison
equal
deleted
inserted
replaced
| 19437:6857f554ae0e | 19438:e8bcd7b0a653 |
|---|---|
| 86 while time.time() - start < timeout and p.returncode is None: | 86 while time.time() - start < timeout and p.returncode is None: |
| 87 time.sleep(.1) | 87 time.sleep(.1) |
| 88 p.timeout = True | 88 p.timeout = True |
| 89 if p.returncode is None: | 89 if p.returncode is None: |
| 90 terminate(p) | 90 terminate(p) |
| 91 p.wait() | |
| 92 threading.Thread(target=t).start() | 91 threading.Thread(target=t).start() |
| 93 | 92 |
| 94 return p | 93 return p |
| 95 | 94 |
| 96 # reserved exit code to skip test (used by hghave) | 95 # reserved exit code to skip test (used by hghave) |