Bug 1522790 [wpt PR 45576] - [Gecko Bug 1522790] Use marionette new window command to open wptrunner windows, a=testonly

Automatic update from web-platform-tests
Use marionette new window command to open wptrunner windows

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

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1522790
gecko-commit: 9e98e314a251258d817c1a93020dcf439dd01b42
gecko-reviewers: jgraham

--
[wpt] Fix intermittent test failures for short timer.

Depends on D23972

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

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1522790
gecko-commit: 3acba738b962607ed98937ebd8d40d77fb001c48
gecko-reviewers: whimboo

--
[wpt] Fix intermittent failures in font-face-[003, 004].html.

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

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1522790
gecko-commit: 251e04906ebfda2d88823f1e526a10f1c2d0fa81
gecko-reviewers: jgraham

--
[wptrunner] Fix MarionetteWindowProtocolPart.set_rect() for optional arguments.

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

bugzilla-url: https://bugzilla.mozilla.org/show_bug.cgi?id=1522790
gecko-commit: f8d941b403d063e1c49011783a4f76ccfe806495
gecko-reviewers: jgraham

--
Remove import of unused time module

--

wpt-commits: 8f3f54589108bb739a6abb153717ad39e0dd1df1, ef70df47c28272b0642d25f70f8e5d3d5ebb7b32, 19320f2a3fd3c8cd3649b8418a7f6a12a9ff576f, 9826d2b6a4472d07056fa16ae151fa943bebc26d, 149d525c8ab1b607d030da6b49d85e9d5890b5b2
wpt-pr: 45576

Author: jgraham

testing/web-platform/tests/css/css-scoping/font-face-003.html

@@ -13,7 +13,7 @@
 </style>
 <div id="host"><span id="in-document">1234567890</span></div>
 <script>
-test(function() {
+  promise_test(async function () {
   host.attachShadow({ mode: "open" }).innerHTML = `
     <style>
       :host {
@@ -24,6 +24,7 @@
     <span id="in-shadow">0123456789</span>
   `;
 
+  await document.fonts.ready;
   assert_equals(document.getElementById('in-document').offsetWidth, 160);
   assert_equals(host.shadowRoot.getElementById('in-shadow').offsetWidth, 160);
 }, "@font-face from document applies to :host");

testing/web-platform/tests/css/css-scoping/font-face-004.html

@@ -14,7 +14,7 @@
 </style>
 <div id="host"><span id="in-document">1234567890</span></div>
 <script>
-test(function() {
+promise_test(async function() {
   host.attachShadow({ mode: "open" }).innerHTML = `
     <style>
       ::slotted(#in-document) {
@@ -25,6 +25,7 @@
     <span id="in-shadow">0123456789</span>
   `;
 
+  await document.fonts.ready;
   assert_equals(document.getElementById('in-document').offsetWidth, 160);
   assert_not_equals(host.shadowRoot.getElementById('in-shadow').offsetWidth, 160);
 }, "@font-face from document applies to a slotted element");

testing/web-platform/tests/html/semantics/disabled-elements/event-propagate-disabled.tentative.html

@@ -153,7 +153,11 @@
       await new Promise(resolve => t.step_timeout(resolve, 0));
 
       const expected = isDisabledFormControl(element) ? expectedEvents : nonDisabledExpectedEvents;
-      assert_array_equals(observedEvents.map(e => e.type), expected, "Observed events");
+
+      t.step_wait_func_done(() => observedEvents.length > 0,
+        () => assert_array_equals(observedEvents.map(e => e.type), expected, "Observed events"),
+        undefined, 1000, 10);
+      ;
 
       for (const observed of observedEvents) {
         assert_equals(observed.target, target, `${observed.type}.target`)

testing/web-platform/tests/html/webappapis/timers/setinterval-cross-realm-callback-report-exception.html

@@ -23,10 +23,9 @@
     `), 4);
     window.clearThisInterval = () => { frames[0].clearInterval(id); };
 
-    t.step_timeout(() => {
-      assert_array_equals(onerrorCalls, ["frame1"]);
-      t.done();
-    }, 8);
+    t.step_wait_func_done(() => onerrorCalls.length > 0,
+                          () => assert_array_equals(onerrorCalls, ["frame1"]),
+                          undefined, 1000, 10);
   });
 });
 </script>

testing/web-platform/tests/html/webappapis/timers/settimeout-cross-realm-callback-report-exception.html

@@ -19,10 +19,9 @@
   window.onload = t.step_func(() => {
     frames[0].setTimeout(new frames[1].Function(`throw new parent.frames[2].Error("PASS");`), 4);
 
-    t.step_timeout(() => {
-      assert_array_equals(onerrorCalls, ["frame1"]);
-      t.done();
-    }, 8);
+    t.step_wait_func_done(() => onerrorCalls.length > 0,
+      () => assert_array_equals(onerrorCalls, ["frame1"]),
+      undefined, 1000, 10);
   });
 });
 </script>

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

@@ -3,7 +3,6 @@
 import json
 import os
 import threading
-import time
 import traceback
 import uuid
 
@@ -103,6 +102,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 +235,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):
@@ -496,7 +447,8 @@ def minimize(self):
         return self.marionette.minimize_window()
 
     def set_rect(self, rect):
-        self.marionette.set_window_rect(rect["x"], rect["y"], rect["height"], rect["width"])
+        self.marionette.set_window_rect(
+            rect.get("x"), rect.get("y"), rect.get("height"), rect.get("width"))
 
     def get_rect(self):
         return self.marionette.window_rect
@@ -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."""