Re-raise TimeoutExpired from process executors

This commit is contained in:
Thomas Nagy 2016-09-03 22:36:41 +02:00
parent af172413f4
commit fc2946ce64
No known key found for this signature in database
GPG Key ID: 49B4C67C05277AAA
1 changed files with 4 additions and 0 deletions

View File

@ -852,6 +852,10 @@ def run_prefork_process(cmd, kwargs, cargs):
raise OSError(trace)
elif ex == 'ValueError':
raise ValueError(trace)
elif ex == 'TimeoutExpired':
exc = TimeoutExpired(cmd, timeout=cargs['timeout'], output=out)
exc.stderr = err
raise exc
else:
raise Exception(trace)
return ret, out, err