Bug 1522790 - Use marionette new window command to open wptrunner windows r=jgraham

Differential Revision: https://phabricator.services.mozilla.com/D23972

Author: jgraham

testing/web-platform/meta/css/css-contain/container-queries/font-relative-units-dynamic.html.ini

@@ -12,8 +12,8 @@
     expected:
       if not fission and (os == "linux") and not debug and asan: [PASS, FAIL]
       if not fission and (os == "android"): FAIL
-      if fission: PASS
-      [FAIL, PASS]
+      if fission: FAIL
+      FAIL
 
   [rcap units respond to changes]
     expected: FAIL

testing/web-platform/meta/html/canvas/element/text/2d.text.draw.fontface.notinpage.html.ini

@@ -4,3 +4,4 @@
       if not fission and debug and swgl: [PASS, FAIL]
       if not fission and debug and not swgl: [FAIL, PASS]
       if not fission and not debug: [PASS, FAIL]
+      FAIL

testing/web-platform/meta/resource-timing/no-entries-for-cross-origin-css-fetched.sub.html.ini

@@ -4,3 +4,4 @@
       if (os == "linux") and not fission and not debug: [PASS, FAIL]
       if (os == "linux") and not fission and debug: [PASS, FAIL]
       if os == "android": FAIL
+      FAIL

testing/web-platform/mozilla/meta/webdriver/harness/crash_content_process.py.ini

@@ -1,11 +1,8 @@
 [crash_content_process.py]
   disabled:
     if asan or tsan: Crash Reporter not enabled.
-    if (os == "android"): https://bugzilla.mozilla.org/show_bug.cgi?id=1848850
-
-  expected:
-    CRASH
-
+    if os == "android": https://bugzilla.mozilla.org/show_bug.cgi?id=1848850
+  expected: CRASH
   [test_detect_crash[capabilities0\]]
     bug: 1848850
     expected:

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/executormarionette.py

@@ -103,6 +103,9 @@ def set_timeout(self, timeout):
             self.marionette.timeout.script = timeout
             self.timeout = timeout
 
+    def create_window(self, type="tab", **kwargs):
+        return self.marionette.open(type=type, focus=True)["handle"]
+
     @property
     def current_window(self):
         return self.marionette.current_window_handle
@@ -233,57 +236,6 @@ def dismiss_alert(self, f):
             else:
                 break
 
-    def get_test_window(self, window_id, parent, timeout=5):
-        """Find the test window amongst all the open windows.
-        This is assumed to be either the named window or the one after the parent in the list of
-        window handles
-
-        :param window_id: The DOM name of the Window
-        :param parent: The handle of the runner window
-        :param timeout: The time in seconds to wait for the window to appear. This is because in
-                        some implementations there's a race between calling window.open and the
-                        window being added to the list of WebDriver accessible windows."""
-        test_window = None
-        end_time = time.time() + timeout
-        while time.time() < end_time:
-            if window_id:
-                try:
-                    # Try this, it's in Level 1 but nothing supports it yet
-                    win_s = self.parent.base.execute_script("return window['%s'];" % self.window_id)
-                    win_obj = json.loads(win_s)
-                    test_window = win_obj["window-fcc6-11e5-b4f8-330a88ab9d7f"]
-                except Exception:
-                    pass
-
-            if test_window is None:
-                handles = self.marionette.window_handles
-                if len(handles) == 2:
-                    test_window = next(iter(set(handles) - {parent}))
-                elif len(handles) > 2 and handles[0] == parent:
-                    # Hope the first one here is the test window
-                    test_window = handles[1]
-
-            if test_window is not None:
-                assert test_window != parent
-                return test_window
-
-            time.sleep(0.1)
-
-        raise Exception("unable to find test window")
-
-    def test_window_loaded(self):
-        """Wait until the page in the new window has been loaded.
-
-        Hereby ignore Javascript execptions that are thrown when
-        the document has been unloaded due to a process change.
-        """
-        while True:
-            try:
-                self.parent.base.execute_script(self.window_loaded_script, asynchronous=True)
-                break
-            except errors.JavascriptException:
-                pass
-
 
 class MarionettePrefsProtocolPart(PrefsProtocolPart):
     def setup(self):
@@ -986,16 +938,13 @@ def do_test(self, test):
         return (test.make_result(extra=extra, *data), [])
 
     def do_testharness(self, protocol, url, timeout):
-        parent_window = protocol.testharness.close_old_windows(self.last_environment["protocol"])
+        protocol.testharness.close_old_windows(self.last_environment["protocol"])
 
         if self.protocol.coverage.is_enabled:
             self.protocol.coverage.reset()
 
-        protocol.base.execute_script("window.open('about:blank', '%s', 'noopener')" % self.window_id)
-        test_window = protocol.testharness.get_test_window(self.window_id, parent_window,
-                                                           timeout=10 * self.timeout_multiplier)
+        test_window = protocol.base.create_window()
         self.protocol.base.set_window(test_window)
-        protocol.testharness.test_window_loaded()
 
         if self.debug_test and self.browser.supports_devtools:
             self.protocol.debug.load_devtools()
@@ -1059,8 +1008,6 @@ def __init__(self, logger, browser, server_config, timeout_multiplier=1,
 
         self.install_extensions = browser.extensions
 
-        with open(os.path.join(here, "reftest.js")) as f:
-            self.script = f.read()
         with open(os.path.join(here, "test-wait.js")) as f:
             self.wait_script = f.read() % {"classname": "reftest-wait"}
 
@@ -1108,10 +1055,19 @@ def do_test(self, test):
                 self.has_window = False
 
             if not self.has_window:
-                self.protocol.base.execute_script(self.script)
-                self.protocol.base.set_window(self.protocol.marionette.window_handles[-1])
+                self.protocol.base.create_window(type="window")
+                # Resize the browser window so that its inner dimensions have
+                # exactly a size of 800x600 pixels, which means ignoring all
+                # visible toolbars and sidebars.
+                offsets = self.protocol.marionette.execute_script("""
+                    return {
+                        width: window.outerWidth - window.innerWidth,
+                        height: window.outerHeight - window.innerHeight,
+                    };
+                """)
+                self.protocol.marionette.set_window_rect(
+                    x=0, y=0, width=800 + offsets["width"], height=600 + offsets["height"])
                 self.has_window = True
-                self.protocol.testharness.test_window_loaded()
 
         if self.protocol.coverage.is_enabled:
             self.protocol.coverage.reset()

testing/web-platform/tests/tools/wptrunner/wptrunner/executors/protocol.py

@@ -150,6 +150,14 @@ def wait(self):
         :returns: True to re-run the test, or False to continue with the next test"""
         pass
 
+    @abstractmethod
+    def create_window(self, type="tab", **kwargs):
+        """Return a handle identifying a freshly created top level browsing context
+
+        :param type: - Type hint, either "tab" or "window"
+        :returns: A protocol-specific handle"""
+        pass
+
     @property
     def current_window(self):
         """Return a handle identifying the current top level browsing context
@@ -202,18 +210,6 @@ def close_old_windows(self, url_protocol):
         """
         pass
 
-    @abstractmethod
-    def get_test_window(self, window_id, parent):
-        """Get the window handle dorresponding to the window containing the
-        currently active test.
-
-        :param window_id: A string containing the DOM name of the Window that
-        contains the test, or None.
-        :param parent: The handle of the runner window.
-        :returns: A protocol-specific window handle.
-        """
-        pass
-
     @abstractmethod
     def test_window_loaded(self):
         """Wait until the newly opened test window has been loaded."""