From 9115045faf08ff7bf1a98c182273fad3149edae2 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Sat, 1 Apr 2017 19:13:16 +0200 Subject: [PATCH] Backed out changeset 024d5d30566d (bug 1352351) for frequently failing resume-timer-on-history-back.html on Windows. r=backout a=backout MozReview-Commit-ID: JSU0OCtbAOe --- testing/web-platform/harness/wptrunner/testloader.py | 1 + testing/web-platform/harness/wptrunner/testrunner.py | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/testing/web-platform/harness/wptrunner/testloader.py b/testing/web-platform/harness/wptrunner/testloader.py index 7e04005d3b03..74dce4aafe33 100644 --- a/testing/web-platform/harness/wptrunner/testloader.py +++ b/testing/web-platform/harness/wptrunner/testloader.py @@ -627,6 +627,7 @@ class PathGroupedSource(TestSource): self.current_queue.put(item) except Empty: return None + return self.current_queue def requeue_test(self, test): diff --git a/testing/web-platform/harness/wptrunner/testrunner.py b/testing/web-platform/harness/wptrunner/testrunner.py index 3965297d8e96..daa62820fe6e 100644 --- a/testing/web-platform/harness/wptrunner/testrunner.py +++ b/testing/web-platform/harness/wptrunner/testrunner.py @@ -499,10 +499,9 @@ class TestRunnerManager(threading.Thread): return None, None try: # Need to block here just to allow for contention with other processes - test = test_queue.get(block=True, timeout=2) + test = test_queue.get(block=True, timeout=1) except Empty: - if test_queue.empty(): - test_queue = None + pass return test, test_queue def run_test(self):