fixup! Fix servo debugger support to work when one test is run.

w3c · Apr 21, 2015 · a68b1a4 · a68b1a4
1 parent df21a57
commit a68b1a4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/wptrunner/browsers/servo.py b/wptrunner/browsers/servo.py
@@ -50,5 +50,4 @@ def __init__(self, logger, binary, debug_info=None):
 
     def executor_browser(self):
         return ExecutorBrowser, {"binary": self.binary,
-                                 "debug_info": self.debug_info,
-                                 "interactive": self.debug_info.interactive if self.debug_info else False}
+                                 "debug_info": self.debug_info}
diff --git a/wptrunner/executors/executorservo.py b/wptrunner/executors/executorservo.py
@@ -91,7 +91,7 @@ def do_test(self, test):
             timeout = test.timeout * self.timeout_multiplier
 
             # Now wait to get the output we expect, or until we reach the timeout
-            if self.debug_info is None and not self.pause_after_test:
+            if not self.interactive and not self.pause_after_test:
                 wait_timeout = timeout + 5
                 self.result_flag.wait(wait_timeout)
             else:
@@ -221,7 +221,7 @@ def do_test(self, test):
 
     def on_output(self, line):
         line = line.decode("utf8", "replace")
-        if self.debug_info.interactive:
+        if self.interactive:
             print line
         else:
             self.logger.process_output(self.proc.pid,

diff --git a/wptrunner/executors/process.py b/wptrunner/executors/process.py
@@ -9,7 +9,8 @@ class ProcessTestExecutor(TestExecutor):
     def __init__(self, *args, **kwargs):
         TestExecutor.__init__(self, *args, **kwargs)
         self.binary = self.browser.binary
-        self.interactive = self.browser.interactive
+        self.interactive = (False if self.debug_info is None
+                            else self.debug_info.interactive)
 
     def setup(self, runner):
         self.runner = runner