Skip to content

A
angle
Commit 36770173 by Lubosz Sarnecki Committed by Commit Bot
Options

capture_replay_tests: Don't shadow subprocess import.

Rename local variable, so using subprocess.Timeout does not result in an exception. This patch fixes the test timeout counter. Bug: angleproject:5742 Change-Id: Ib6991bc58df6ea653f765dfe9f6117add75b85db Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2748339 Commit-Queue: Lubosz Sarnecki <lubosz.sarnecki@collabora.com> Reviewed-by: 's avatarCody Northrop <cnorthrop@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org>
parent 6f74a12b
Showing with 7 additions and 7 deletions
src/tests/capture_replay_tests.py
...@@ -252,22 +252,22 @@ class ChildProcessesManager(): ...@@ -252,22 +252,22 @@ class ChildProcessesManager():
depot_tools_path) depot_tools_path)
def RunSubprocess(self, command, env=None, pipe_stdout=True, timeout=None): def RunSubprocess(self, command, env=None, pipe_stdout=True, timeout=None):
subprocess = SubProcess(command, env, pipe_stdout) proc = SubProcess(command, env, pipe_stdout)
debug('Creating subprocess: %s with pid %d' % (' '.join(command), subprocess.Pid())) debug('Creating subprocess: %s with pid %d' % (' '.join(command), proc.Pid()))
self.subprocesses[subprocess.Pid()] = subprocess self.subprocesses[proc.Pid()] = proc
try: try:
returncode, output = self.subprocesses[subprocess.Pid()].Join(timeout) returncode, output = self.subprocesses[proc.Pid()].Join(timeout)
self.RemoveSubprocess(subprocess.Pid()) self.RemoveSubprocess(proc.Pid())
if returncode != 0: if returncode != 0:
return -1, output return -1, output
return returncode, output return returncode, output
except KeyboardInterrupt: except KeyboardInterrupt:
raise raise
except subprocess.TimeoutExpired as e: except subprocess.TimeoutExpired as e:
self.RemoveSubprocess(subprocess.Pid()) self.RemoveSubprocess(proc.Pid())
return -2, str(e) return -2, str(e)
except Exception as e: except Exception as e:
self.RemoveSubprocess(subprocess.Pid()) self.RemoveSubprocess(proc.Pid())
return -1, str(e) return -1, str(e)
def RemoveSubprocess(self, subprocess_id): def RemoveSubprocess(self, subprocess_id):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment