From da8677221e261730dd61405860eebe56cf2b1d07 Mon Sep 17 00:00:00 2001
From: Josh Matthews <josh@joshmatthews.net>
Date: Mon, 2 Oct 2017 18:12:33 +0200
Subject: [PATCH] Avoid endless testrunner restart loops.

If the first test selected by a testrunner thread had a CRASH expectation,
the testrunner believed that it needed to restart and would never actually
get around to running the test.
---
 .../tools/wptrunner/wptrunner/testrunner.py                   | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index d494010a9f7..ee118dc9357 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -154,6 +154,7 @@ class BrowserManager(object):
         self.browser = browser
         self.no_timeout = no_timeout
         self.browser_settings = None
+        self.last_test = None
 
         self.started = False
 
@@ -163,8 +164,9 @@ class BrowserManager(object):
         browser_settings = self.browser.settings(test)
         restart_required = ((self.browser_settings is not None and
                              self.browser_settings != browser_settings) or
-                            test.expected() == "CRASH")
+                            (self.last_test != test and test.expected() == "CRASH"))
         self.browser_settings = browser_settings
+        self.last_test = test
         return restart_required
 
     def init(self):