Bug 1245937 - requestLongerTimeout for browser_chatwindow.js and browser_focus.js since 1154277 slowed them down, transplanted from mozilla-aurora. rs=testonly
authorPhil Ringnalda <philringnalda@gmail.com>
Mon, 15 Feb 2016 13:12:06 -0800
changeset 285537 6d20cb4a0dd85df647eb0e27c6c099d7439fd217
parent 285536 8dac48a684eebfad868cd6df3ef4a852e7f48471
child 285538 bd7f29886069642dfde5049cc5b399b715fe24ca
push id72403
push usercbook@mozilla.com
push dateThu, 25 Feb 2016 10:59:17 +0000
treeherdermozilla-inbound@3b913f81cb98 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstestonly
bugs1245937, 1154277
milestone47.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
Bug 1245937 - requestLongerTimeout for browser_chatwindow.js and browser_focus.js since 1154277 slowed them down, transplanted from mozilla-aurora. rs=testonly
browser/base/content/test/chat/browser_chatwindow.js
browser/base/content/test/chat/browser_focus.js
--- a/browser/base/content/test/chat/browser_chatwindow.js
+++ b/browser/base/content/test/chat/browser_chatwindow.js
@@ -1,14 +1,16 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 
+requestLongerTimeout(2);
+
 var chatbar = document.getElementById("pinnedchats");
 
 add_chat_task(function* testOpenCloseChat() {
   let chatbox = yield promiseOpenChat("http://example.com");
   Assert.strictEqual(chatbox, chatbar.selectedChat);
   // we requested a "normal" chat, so shouldn't be minimized
   Assert.ok(!chatbox.minimized, "chat is not minimized");
   Assert.equal(chatbar.childNodes.length, 1, "should be 1 chat open");
--- a/browser/base/content/test/chat/browser_focus.js
+++ b/browser/base/content/test/chat/browser_focus.js
@@ -2,16 +2,18 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 // Tests the focus functionality.
 
 Components.utils.import("resource://gre/modules/Promise.jsm", this);
 const CHAT_URL = "https://example.com/browser/browser/base/content/test/chat/chat.html";
 
+requestLongerTimeout(2);
+
 // Is the currently opened tab focused?
 function isTabFocused() {
   let tabb = gBrowser.getBrowserForTab(gBrowser.selectedTab);
   // focus sucks in tests - our window may have lost focus.
   let elt = Services.focus.getFocusedElementForWindow(window, false, {});
   return elt == tabb;
 }