Merge inbound to mozilla-central. a=merge
authorCsoregi Natalia <ncsoregi@mozilla.com>
Thu, 15 Aug 2019 22:34:31 +0300
changeset 488345 b283a7ef186c216d765631f6cb1260a3fa2ee42c
parent 488344 44aac6fc3352cc6e5d846863778a1d616990c9e7 (current diff)
parent 488342 05767c735d24ae5863d60182ee658accdf4f2fa0 (diff)
child 488346 c99af9d2e6381e171166f7b31629cc3539252cfa
child 488438 bd6df046c082cdab22dac956e16e357c1d9b5f4b
child 488439 9229fd85bc05af4c33c8cb8f5e489eca1043722d
push id92704
push userncsoregi@mozilla.com
push dateThu, 15 Aug 2019 19:39:07 +0000
treeherderautoland@c99af9d2e638 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge
milestone70.0a1
first release with
nightly linux32
b283a7ef186c / 70.0a1 / 20190815193505 / files
nightly linux64
b283a7ef186c / 70.0a1 / 20190815193505 / files
nightly mac
b283a7ef186c / 70.0a1 / 20190815193505 / files
nightly win32
b283a7ef186c / 70.0a1 / 20190815193505 / files
nightly win64
b283a7ef186c / 70.0a1 / 20190815193505 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Merge inbound to mozilla-central. a=merge
--- a/browser/components/customizableui/test/browser_901207_searchbar_in_panel.js
+++ b/browser/components/customizableui/test/browser_901207_searchbar_in_panel.js
@@ -3,17 +3,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 "use strict";
 
 logActiveElement();
 
 async function waitForSearchBarFocus() {
   let searchbar = document.getElementById("searchbar");
-  await waitForCondition(function() {
+  await TestUtils.waitForCondition(function() {
     logActiveElement();
     return document.activeElement === searchbar.textbox.inputField;
   });
 }
 
 // Ctrl+K should open the menu panel and focus the search bar if the search bar is in the panel.
 add_task(async function check_shortcut_when_in_closed_overflow_panel_closed() {
   CustomizableUI.addWidgetToArea(
@@ -60,45 +60,45 @@ add_task(async function check_shortcut_w
     !navbar.hasAttribute("overflowing"),
     "Should start with a non-overflowing toolbar."
   );
   ok(CustomizableUI.inDefaultState, "Should start in default state.");
 
   Services.prefs.setBoolPref("browser.search.widget.inNavBar", true);
 
   window.resizeTo(kForceOverflowWidthPx, window.outerHeight);
-  await waitForCondition(() => {
+  await TestUtils.waitForCondition(() => {
     return (
       navbar.getAttribute("overflowing") == "true" &&
       !navbar.querySelector("#search-container")
     );
   });
   ok(
     !navbar.querySelector("#search-container"),
     "Search container should be overflowing"
   );
 
   let shownPanelPromise = promiseOverflowShown(window);
   sendWebSearchKeyCommand();
   await shownPanelPromise;
 
   let chevron = document.getElementById("nav-bar-overflow-button");
-  await waitForCondition(() => chevron.open);
+  await TestUtils.waitForCondition(() => chevron.open);
 
   await waitForSearchBarFocus();
 
   let hiddenPanelPromise = promiseOverflowHidden(window);
   EventUtils.synthesizeKey("KEY_Escape");
   await hiddenPanelPromise;
 
   Services.prefs.setBoolPref("browser.search.widget.inNavBar", false);
 
   navbar = document.getElementById(CustomizableUI.AREA_NAVBAR);
   window.resizeTo(this.originalWindowWidth, window.outerHeight);
-  await waitForCondition(() => !navbar.hasAttribute("overflowing"));
+  await TestUtils.waitForCondition(() => !navbar.hasAttribute("overflowing"));
   ok(
     !navbar.hasAttribute("overflowing"),
     "Should not have an overflowing toolbar."
   );
 });
 
 // Ctrl+K should focus the search bar if it is in the navbar and not overflowing.
 add_task(async function check_shortcut_when_not_in_overflow() {
--- a/taskcluster/scripts/misc/wrench-windows-tests.sh
+++ b/taskcluster/scripts/misc/wrench-windows-tests.sh
@@ -7,17 +7,17 @@ set -x -e -v
 # tool in the WebRender repository.
 # The builds involved require a number of dependencies to be available,
 # which is all handled below.
 
 cd $GECKO_PATH
 
 # This will download the rustc, MSVC, and wrench-deps artifacts.
 . taskcluster/scripts/misc/tooltool-download.sh
-export PATH=$PATH:$MOZ_FETCHES_DIR/rustc/bin
+export PATH=$PATH:$(cd $MOZ_FETCHES_DIR && pwd)/rustc/bin
 
 .  taskcluster/scripts/misc/vs-setup.sh
 
 # Move the wrench-deps vendored crates into place
 mv ${MOZ_FETCHES_DIR}/wrench-deps/{vendor,.cargo} gfx/wr
 cd gfx/wr
 
 # This is needed for the WebRender standalone reftests
--- 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
@@ -3,25 +3,16 @@
   [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 == "linux") and not sw-e10s and debug and not webrender: [PASS, TIMEOUT, FAIL]
-      if (os == "linux") and sw-e10s: [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and not webrender and (processor == "x86_64"): [FAIL, PASS, TIMEOUT]
-      if (os == "linux") and not debug and (bits == 32): [PASS, TIMEOUT, FAIL]
-      if os == "win": [PASS, TIMEOUT, FAIL]
-      if os == "mac": [PASS, TIMEOUT, FAIL]
-      if (os == "android") and debug: [PASS, FAIL]
-      if (os == "android") and not debug: [PASS, FAIL]
-      FAIL
+    expected: [PASS, FAIL, TIMEOUT]
 
   [Https downgrade stylesheet => No headers]
     expected: TIMEOUT
 
   [Https downgrade image => No headers]
     expected: NOTRUN
 
--- a/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini
+++ b/testing/web-platform/meta/pointerevents/pointerlock/pointerevent_coordinates_when_locked.html.ini
@@ -1,5 +1,5 @@
 [pointerevent_coordinates_when_locked.html]
   [mouse Test pointerevent coordinates when pointer is locked]
     expected:
-      if webrender and (os == "linux") and not debug: ["PASS", "FAIL"]
+      if webrender and (os == "linux"): ["PASS", "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,3 @@
 [pointerevent_movementxy_with_pointerlock.html]
   [mouse pointerevent movementX/Y with pointerlock test]
-    expected:
-      if webrender and (os == "win") and debug: FAIL
-      if not webrender and (os == "android") and debug: FAIL
-
+    expected: [PASS, FAIL]