From 9362fcf468ae542ede4893b2c2e62789c0c09395 Mon Sep 17 00:00:00 2001 From: Geoff Brown Date: Tue, 12 Sep 2017 09:35:13 -0600 Subject: [PATCH] Bug 1398933 - Follow-up, fix cannot compare timedelta bustage, on a CLOSED TREE --- testing/mozharness/scripts/desktop_unittest.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/testing/mozharness/scripts/desktop_unittest.py b/testing/mozharness/scripts/desktop_unittest.py index e9bb0115c2a5..0a56dcebd370 100755 --- a/testing/mozharness/scripts/desktop_unittest.py +++ b/testing/mozharness/scripts/desktop_unittest.py @@ -670,6 +670,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix abs_res_dir = self.query_abs_res_dir() max_verify_time = timedelta(minutes=60) + verify_time_exceeded = False start_time = datetime.now() if suites: @@ -762,7 +763,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix # (partial) results are made available in a timely manner. self.info("TinderboxPrint: Verification too long: Not all tests were verified.
") # Signal verify time exceeded, to break out of suites loop also. - max_verify_time = 0 + verify_time_exceeded = True break final_cmd = copy.copy(cmd) final_cmd.extend(verify_args) @@ -798,7 +799,7 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix self.log("The %s suite: %s ran with return status: %s" % (suite_category, suite, tbpl_status), level=log_level) - if max_verify_time <= 0: + if verify_time_exceeded: # Verification ran out of time, detected in inner loop. break else: