From 4bf292890c48d408e7dc0acd82e85ddcc9e0dde2 Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 14 Dec 2015 11:25:48 -0800 Subject: Fix proxy end2end tests Some transport callbacks weren't getting triggered. We now ensure that this always occurs. Additionally: left some debug only code around to make this class of bug easier to diagnose in the future. --- tools/run_tests/jobset.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tools/run_tests/jobset.py') diff --git a/tools/run_tests/jobset.py b/tools/run_tests/jobset.py index fdbddf82ee..48afbaf4cb 100755 --- a/tools/run_tests/jobset.py +++ b/tools/run_tests/jobset.py @@ -273,7 +273,7 @@ class Job(object): update_cache.finished(self._spec.identity(), self._bin_hash) elif self._state == _RUNNING and time.time() - self._start > self._spec.timeout_seconds: if self._timeout_retries < self._spec.timeout_retries: - message('TIMEOUT_FLAKE', self._spec.shortname, stdout, do_newline=True) + message('TIMEOUT_FLAKE', '%s [pid=%d]' % (self._spec.shortname, self._process.pid), stdout, do_newline=True) self._timeout_retries += 1 self.result.num_failures += 1 self.result.retries = self._timeout_retries + self._retries @@ -282,7 +282,7 @@ class Job(object): self._process.terminate() self.start() else: - message('TIMEOUT', self._spec.shortname, stdout, do_newline=True) + message('TIMEOUT', '%s [pid=%d]' % (self._spec.shortname, self._process.pid), stdout, do_newline=True) self.kill() self.result.state = 'TIMEOUT' self.result.num_failures += 1 -- cgit v1.2.3