Mercurial > public > mercurial-scm > hg

comparison tests/run-tests.py @ 19407:ce3d1cf957f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
run-tests: patch over py2.4 proc.wait() race
author Matt Mackall <mpm@selenic.com>
date Tue, 16 Jul 2013 12:44:11 -0500
parents ff1586a3adc5
children a4de0d3dc35a
comparison
equal deleted inserted replaced
19406:3185b347ae98 19407:ce3d1cf957f8
836 except KeyboardInterrupt: 836 except KeyboardInterrupt:
837 vlog('# Handling keyboard interrupt') 837 vlog('# Handling keyboard interrupt')
838 cleanup() 838 cleanup()
839 raise 839 raise
840 840
841 ret = proc.wait() 841 try:
842 ret = proc.wait()
843 except OSError:
844 # Py2.4 seems to have a race here
845 pass
842 if wifexited(ret): 846 if wifexited(ret):
843 ret = os.WEXITSTATUS(ret) 847 ret = os.WEXITSTATUS(ret)
844 848
845 if proc.timeout: 849 if proc.timeout:
846 ret = 'timeout' 850 ret = 'timeout'