Bug 1376228 - Pass group_metadata through the running state, r=maja_zf draft
authorJames Graham <james@hoppipolla.co.uk>
Mon, 26 Jun 2017 16:37:47 -0700
changeset 600452 9bcb587ecac0af957bd15df589cc60007ce4ddda
parent 600437 6b98953213350d847f2d1c8165922af47b96eee4
child 635004 9314c29874e6fbb5a9f15a6b3b625d9fbd65e15f
push id65771
push userbmo:james@hoppipolla.co.uk
push dateMon, 26 Jun 2017 23:41:18 +0000
reviewersmaja_zf
bugs1376228
milestone56.0a1
Bug 1376228 - Pass group_metadata through the running state, r=maja_zf MozReview-Commit-ID: CZUxRLh7j6B
testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
--- a/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/testing/web-platform/tests/tools/wptrunner/wptrunner/testrunner.py
@@ -229,17 +229,17 @@ class BrowserManager(object):
     def is_alive(self):
         return self.browser.is_alive()
 
 
 class _RunnerManagerState(object):
     before_init = namedtuple("before_init", [])
     initializing = namedtuple("initializing_browser",
                               ["test", "test_group", "group_metadata", "failure_count"])
-    running = namedtuple("running", ["test", "test_group"])
+    running = namedtuple("running", ["test", "test_group", "group_metadata"])
     restarting = namedtuple("restarting", ["test", "test_group", "group_metadata"])
     error = namedtuple("error", [])
     stop = namedtuple("stop", [])
 
 
 RunnerManagerState = _RunnerManagerState()
 
 
@@ -473,17 +473,18 @@ class TestRunnerManager(threading.Thread
         self.test_runner_proc.start()
         self.logger.debug("Test runner started")
         # Now we wait for either an init_succeeded event or an init_failed event
 
     def init_succeeded(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
         self.browser.after_init()
         return RunnerManagerState.running(self.state.test,
-                                          self.state.test_group)
+                                          self.state.test_group,
+                                          self.state.group_metadata)
 
     def init_failed(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
         self.browser.after_init()
         self.stop_runner(force=True)
         return RunnerManagerState.initializing(self.state.test,
                                                self.state.test_group,
                                                self.state.group_metadata,
@@ -586,17 +587,17 @@ class TestRunnerManager(threading.Thread
         if test is None:
             return RunnerManagerState.stop()
         if test_group != self.state.test_group:
             # We are starting a new group of tests, so force a restart
             restart = True
         if restart:
             return RunnerManagerState.restarting(test, test_group, group_metadata)
         else:
-            return RunnerManagerState.running(test, test_group)
+            return RunnerManagerState.running(test, test_group, group_metadata)
 
     def restart_runner(self):
         """Stop and restart the TestRunner"""
         assert isinstance(self.state, RunnerManagerState.restarting)
         self.stop_runner()
         return RunnerManagerState.initializing(self.state.test, self.state.test_group, self.state.group_metadata, 0)
 
     def log(self, action, kwargs):