Merge inbound to mozilla-central. a=merge
authorMihai Alexandru Michis <malexandru@mozilla.com>
Wed, 31 Jul 2019 18:48:32 +0300
changeset 485571 1e64b8a0c546a49459d404aaf930d5b1f621246a
parent 485566 46b354546ad842b72f02a025126dfedcc38e5ad0 (current diff)
parent 485570 cc0e157bed86664d03ccab7967ba7100477029c6 (diff)
child 485600 c72a0dc1b97bcb7d14781cd5bc288c68095d65e2
child 485706 8d408d3d062c50fd0fdd8d604c591f7bd34a4a67
push id36369
push usermalexandru@mozilla.com
push dateWed, 31 Jul 2019 15:54:00 +0000
treeherdermozilla-central@1e64b8a0c546 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone70.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
--- a/remote/doc/index.rst
+++ b/remote/doc/index.rst
@@ -38,19 +38,19 @@ Developers
   Architecture.md
   Prefs.md
   CodeStyle.md
 
 
 Bugs
 ====
 
-Bugs are tracked under the `Remote Protocol`_ product.
+Bugs are tracked under the `Remote Protocol product`_.
 
-.. _Remote Protocol: https://bugzilla.mozilla.org/describecomponents.cgi?product=Remote%20Protocol
+.. _Remote Protocol product: https://bugzilla.mozilla.org/describecomponents.cgi?product=Remote%20Protocol
 
 
 Communication
 =============
 
 The mailing list for Firefox remote debugging discussion is
 `dev-remote@lists.mozilla.org`_ (`subscribe`_, `archive`_).
 
--- a/testing/web-platform/meta/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
+++ b/testing/web-platform/meta/fetch/sec-metadata/redirect/redirect-https-downgrade.tentative.sub.html.ini
@@ -2,21 +2,19 @@
   expected: TIMEOUT
   [Https downgrade track => No headers]
     expected: NOTRUN
 
   [Https downgrade font => No headers]
     expected: NOTRUN
 
   [Https downgrade prefetch => No headers]
-    bug: [https://bugzilla.mozilla.org/show_bug.cgi?id=1568717, https://bugzilla.mozilla.org/show_bug.cgi?id=1569098]
     expected:
       if os == "android": PASS
-      if (os == "linux") and debug and webrender: TIMEOUT
-      if (os == "mac") and not debug: PASS
-      FAIL
+      [FAIL, TIMEOUT, PASS]
+    bug: [https://bugzilla.mozilla.org/show_bug.cgi?id=1568717, https://bugzilla.mozilla.org/show_bug.cgi?id=1569098]
 
   [Https downgrade stylesheet => No headers]
     expected: TIMEOUT
 
   [Https downgrade image => No headers]
     expected: NOTRUN
 
--- a/testing/web-platform/meta/html/cross-origin-opener/new_window_same_origin.tentative.html.ini
+++ b/testing/web-platform/meta/html/cross-origin-opener/new_window_same_origin.tentative.html.ini
@@ -1,11 +1,12 @@
 [new_window_same_origin.tentative.html]
   expected:
-    if (os == "linux") and sw-e10s: [OK, TIMEOUT]
+    if (os == "mac") and debug: ["OK", "ERROR"]
+    if (os == "linux") and sw-e10s: ["OK", "TIMEOUT"]
   [same-origin document opening popup to http://www1.web-platform.test:8000 with COOP: "same-site unsafe-allow-outgoing"]
     expected:
       if os == "android": FAIL
 
   [same-origin document opening popup to http://web-platform.test:8000 with COOP: "same-origin unsafe-allow-outgoing"]
     expected:
       if os == "android": FAIL
 
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_movementxy_with_pointerlock.html.ini
@@ -1,6 +1,5 @@
 [pointerevent_movementxy_with_pointerlock.html]
   [mouse pointerevent movementX/Y with pointerlock test]
     expected:
-      if (os == "android") and not e10s: FAIL
-      if (os == "win") and debug and webrender: FAIL
-
+      if os == "android": FAIL
+      [PASS, FAIL]