Bug 1398933 - Ensure test-verify bails out before timing out; r=jmaher

testing/mozharness/scripts/desktop_unittest.py

@@ -761,6 +761,8 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
                         # tests so that a task timeout is not triggered, and so that
                         # (partial) results are made available in a timely manner.
                         self.info("TinderboxPrint: Verification too long: Not all tests were verified.<br/>")
+                        # Signal verify time exceeded, to break out of suites loop also.
+                        max_verify_time = 0
                         break
                     final_cmd = copy.copy(cmd)
                     final_cmd.extend(verify_args)
@@ -795,6 +797,10 @@ class DesktopUnittest(TestingMixin, MercurialScript, BlobUploadMixin, MozbaseMix
                     else:
                         self.log("The %s suite: %s ran with return status: %s" %
                                  (suite_category, suite, tbpl_status), level=log_level)
+
+                if max_verify_time <= 0:
+                    # Verification ran out of time, detected in inner loop.
+                    break
         else:
             self.debug('There were no suites to run for %s' % suite_category)