Backed out 4 changesets (bug 1633102) for causing perma ss mochitest timeout
authorStefan Hindli <shindli@mozilla.com>
Sat, 25 Apr 2020 17:28:03 +0300
changeset 526076 159fde0b4a108d38344382d29b857a7187174f59
parent 526075 d83b3a48d20b95630a949fae9cdc8969aac1ca9c
child 526077 f3323f5ac02caf7077dac029ed011619df6e2cb3
push id37349
push userncsoregi@mozilla.com
push dateSat, 25 Apr 2020 22:00:31 +0000
treeherdermozilla-central@6ba63b50d930 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1633102
milestone77.0a1
backs out22a533517b402c2e5d99befb60430a599c87e5ce
fdfaa77689459e74583beb04190c518a78475697
ffee98ab606b08aab2d05de74c87928be044ddb4
0fc6e510d80459a3749342f1bb332b8d9994e836
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
Backed out 4 changesets (bug 1633102) for causing perma ss mochitest timeout Backed out changeset 22a533517b40 (bug 1633102) Backed out changeset fdfaa7768945 (bug 1633102) Backed out changeset ffee98ab606b (bug 1633102) Backed out changeset 0fc6e510d804 (bug 1633102)
browser/tools/mozscreenshots/browser.ini
browser/tools/mozscreenshots/browser_boundingbox.js
browser/tools/mozscreenshots/browser_screenshots.js
browser/tools/mozscreenshots/browser_screenshots_cropping.js
browser/tools/mozscreenshots/moz.build
browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
browser/tools/mozscreenshots/tests/browser/browser.ini
browser/tools/mozscreenshots/tests/browser/browser_boundingbox.js
browser/tools/mozscreenshots/tests/browser/browser_screenshots.js
browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js
rename from browser/tools/mozscreenshots/tests/browser/browser.ini
rename to browser/tools/mozscreenshots/browser.ini
--- a/browser/tools/mozscreenshots/tests/browser/browser.ini
+++ b/browser/tools/mozscreenshots/browser.ini
@@ -1,8 +1,8 @@
 [DEFAULT]
 subsuite = screenshots
 support-files =
-  ../../head.js
+  head.js
 
 [browser_screenshots.js]
 [browser_screenshots_cropping.js]
 [browser_boundingbox.js]
rename from browser/tools/mozscreenshots/tests/browser/browser_boundingbox.js
rename to browser/tools/mozscreenshots/browser_boundingbox.js
rename from browser/tools/mozscreenshots/tests/browser/browser_screenshots.js
rename to browser/tools/mozscreenshots/browser_screenshots.js
rename from browser/tools/mozscreenshots/tests/browser/browser_screenshots_cropping.js
rename to browser/tools/mozscreenshots/browser_screenshots_cropping.js
--- a/browser/tools/mozscreenshots/moz.build
+++ b/browser/tools/mozscreenshots/moz.build
@@ -17,21 +17,21 @@ with Files("permissionPrompts/**"):
     BUG_COMPONENT = ("Firefox", "Site Permissions")
 
 with Files("preferences/**"):
     BUG_COMPONENT = ("Firefox", "Preferences")
 
 BROWSER_CHROME_MANIFESTS += [
     # Each test is in it's own directory so it gets run in a clean profile with
     # run-by-dir.
+    'browser.ini',
     'controlCenter/browser.ini',
     'devtools/browser.ini',
     'permissionPrompts/browser.ini',
     'preferences/browser.ini',
     'primaryUI/browser.ini',
-    'tests/browser/browser.ini',
 ]
 
 TEST_DIRS += [
     'mozscreenshots/extension',
 ]
 
 XPCSHELL_TESTS_MANIFESTS += ['tests/xpcshell/xpcshell.ini']
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/TestRunner.jsm
@@ -36,17 +36,17 @@ ChromeUtils.defineModuleGetter(
 );
 
 var TestRunner = {
   combos: null,
   completedCombos: 0,
   currentComboIndex: 0,
   _lastCombo: null,
   _libDir: null,
-  croppingPadding: 0,
+  croppingPadding: 10,
   mochitestScope: null,
 
   init(extensionPath) {
     this._extensionPath = extensionPath;
     this.setupOS();
   },
 
   /**
@@ -136,19 +136,16 @@ var TestRunner = {
     // Don't let the caret blink since it causes false positives for image diffs
     Services.prefs.setIntPref("ui.caretBlinkTime", -1);
     // Disable some animations that can cause false positives, such as the
     // reload/stop button spinning animation.
     Services.prefs.setIntPref("ui.prefersReducedMotion", 1);
 
     let browserWindow = Services.wm.getMostRecentWindow("navigator:browser");
 
-    // Prevent the mouse cursor from causing hover styles or tooltips to appear.
-    browserWindow.windowUtils.disableNonTestMouseEvents(true);
-
     // When being automated through Marionette, Firefox shows a prominent indication
     // in the urlbar and identity block. We don't want this to show when testing browser UI.
     // Note that this doesn't prevent subsequently opened windows from showing the automation UI.
     browserWindow.document
       .getElementById("main-window")
       .removeAttribute("remotecontrol");
 
     let selectedBrowser = browserWindow.gBrowser.selectedBrowser;
@@ -250,17 +247,16 @@ var TestRunner = {
     gBrowser.unpinTab(gBrowser.selectedTab);
     BrowserTestUtils.loadURI(
       gBrowser.selectedBrowser,
       "data:text/html;charset=utf-8,<h1>Done!"
     );
     browserWindow.restore();
     Services.prefs.clearUserPref("ui.caretBlinkTime");
     Services.prefs.clearUserPref("ui.prefersReducedMotion");
-    browserWindow.windowUtils.disableNonTestMouseEvents(false);
   },
 
   // helpers
 
   /**
    * Calculate the bounding box based on CSS selector from config for cropping
    *
    * @param {String[]} selectors - array of CSS selectors for relevant DOM element
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/ControlCenter.jsm
@@ -314,11 +314,9 @@ async function openProtectionsPopup() {
   let gBrowser = browserWindow.gBrowser;
   let { gProtectionsHandler } = gBrowser.ownerGlobal;
   gProtectionsHandler._protectionsPopup.hidePopup();
   // Disable the popup shadow on OSX until we have figured out bug 1425253.
   if (AppConstants.platform == "macosx") {
     gProtectionsHandler._protectionsPopup.classList.add("no-shadow");
   }
   gProtectionsHandler.showProtectionsPopup();
-  // Wait for any animation.
-  await new Promise(_ => setTimeout(_, 500));
 }
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/DevTools.jsm
@@ -59,26 +59,26 @@ var DevTools = {
         await new Promise(resolve => setTimeout(resolve, 1000));
       },
     },
     sideToolbox: {
       async applyConfig() {
         let target = await getTargetForSelectedTab();
         let toolbox = await gDevTools.showToolbox(target, "inspector", "right");
         this.selectors = [selectToolbox.bind(null, toolbox)];
-        await new Promise(resolve => setTimeout(resolve, 1000));
+        await new Promise(resolve => setTimeout(resolve, 500));
       },
     },
     undockedToolbox: {
       windowType: "devtools:toolbox",
       async applyConfig() {
         let target = await getTargetForSelectedTab();
         let toolbox = await gDevTools.showToolbox(
           target,
           "inspector",
           "window"
         );
         this.selectors = [selectToolbox.bind(null, toolbox)];
-        await new Promise(resolve => setTimeout(resolve, 1000));
+        await new Promise(resolve => setTimeout(resolve, 500));
       },
     },
   },
 };
--- a/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
+++ b/browser/tools/mozscreenshots/mozscreenshots/extension/configurations/PermissionPrompts.jsm
@@ -112,26 +112,26 @@ var PermissionPrompts = {
       selectors: ["#notification-popup", "#identity-box"],
       async applyConfig() {
         Services.prefs.setBoolPref("xpinstall.whitelist.required", false);
 
         let browserWindow = Services.wm.getMostRecentWindow(
           "navigator:browser"
         );
         let notification = browserWindow.document.getElementById(
-          "addon-webext-permissions-notification"
+          "addon-install-confirmation-notification"
         );
 
         await closeLastTab();
         await clickOn("#addons");
 
         // We want to skip the progress-notification, so we wait for
         // the install-confirmation screen to be "not hidden" = shown.
         return BrowserTestUtils.waitForCondition(
-          () => !notification.hidden,
+          () => !notification.hasAttribute("hidden"),
           "addon install confirmation did not show",
           200
         ).catch(msg => {
           return Promise.resolve({ todo: msg });
         });
       },
     },
   },