Bug 1431394 - requestCompleteLog so mozprocess knows we're still alive for the long session. r=MattN, a=test-only
authorEdan Reynolds <edanreynolds@gmail.com>
Tue, 23 Jan 2018 15:30:17 +1100
changeset 454484 1544a22ca3134c8a7f6a9417296ecdfe6f0711bd
parent 454483 3221e647134d970526ca63fa24cb3c5b3c4b4cb2
child 454485 9878e0378cadb2ac2c3e4a8a591b8eb127a965b1
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, test-only
bugs1431394
milestone59.0
Bug 1431394 - requestCompleteLog so mozprocess knows we're still alive for the long session. r=MattN, a=test-only
browser/tools/mozscreenshots/head.js
browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js
--- a/browser/tools/mozscreenshots/head.js
+++ b/browser/tools/mozscreenshots/head.js
@@ -12,16 +12,19 @@ const EXTENSION_DIR = "chrome://mochites
 
 let TestRunner;
 
 async function setup() {
   // This timeout doesn't actually end the job even if it is hit - the buildbot timeout will
   // handle things for us if the test actually hangs.
   requestLongerTimeout(100);
 
+  // Generate output so mozprocess knows we're still alive for the long session.
+  SimpleTest.requestCompleteLog();
+
   info("installing extension temporarily");
   let chromeURL = Services.io.newURI(EXTENSION_DIR);
   let dir = chromeRegistry.convertChromeURL(chromeURL).QueryInterface(Ci.nsIFileURL).file;
   await AddonManager.installTemporaryAddon(dir);
 
   info("Checking for mozscreenshots extension");
   return new Promise((resolve) => {
     AddonManager.getAddonByID("mozscreenshots@mozilla.org", (aAddon) => {
--- a/browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js
+++ b/browser/tools/mozscreenshots/primaryUI/browser_primaryUI.js
@@ -6,15 +6,11 @@
 
 "use strict";
 
 add_task(async function capture() {
   if (!shouldCapture()) {
     return;
   }
 
-  if (AppConstants.platform == "macosx") {
-    // Bug 1425394 - Generate output so mozprocess knows we're still alive for the long session.
-    SimpleTest.requestCompleteLog();
-  }
   let sets = ["TabsInTitlebar", "Tabs", "WindowSize", "Toolbars", "LightweightThemes", "UIDensities"];
   await TestRunner.start(sets, "primaryUI");
 });