Bug 1156151 - Increase timeout in browser_perf-columns-js-calltree and remove unused vars in browser_perf-console-record-08.js. a=test-only
authorVictor Porof <vporof@mozilla.com>
Fri, 12 Jun 2015 18:23:18 -0400
changeset 275049 44a9aac7edbf18d2dfef442ce8740929d3aa70ff
parent 275048 ad605b32ec505647040b8bfbd4fcdb17d846d61e
child 275050 e5142f0d162fb7f481d2474ee458e34d14ee9664
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1156151
milestone40.0a2
Bug 1156151 - Increase timeout in browser_perf-columns-js-calltree and remove unused vars in browser_perf-console-record-08.js. a=test-only
browser/devtools/performance/test/browser_perf-columns-js-calltree.js
browser/devtools/performance/test/browser_perf-console-record-08.js
--- a/browser/devtools/performance/test/browser_perf-columns-js-calltree.js
+++ b/browser/devtools/performance/test/browser_perf-columns-js-calltree.js
@@ -1,15 +1,18 @@
 /* Any copyright is dedicated to the Public Domain.
    http://creativecommons.org/publicdomain/zero/1.0/ */
 
 /**
  * Tests that the js call tree view renders the correct columns.
  */
 function spawnTest () {
+  // This test seems to take a long time to cleanup on Ubuntu VMs.
+  requestLongerTimeout(2);
+
   let { panel } = yield initPerformance(SIMPLE_URL);
   let { EVENTS, $, $$, DetailsView, JsCallTreeView } = panel.panelWin;
 
   // Enable platform data to show the `busyWait` function in the tree.
   Services.prefs.setBoolPref(PLATFORM_DATA_PREF, true);
 
   yield startRecording(panel);
   yield busyWait(1000);
--- a/browser/devtools/performance/test/browser_perf-console-record-08.js
+++ b/browser/devtools/performance/test/browser_perf-console-record-08.js
@@ -19,71 +19,70 @@ function testRecordings (win, expected) 
     ok(recording.isRecording() == !!(expected[i] & R), `recording ${i+1} has expected console state.`);
     ok((recording === current) == !!(expected[i] & S), `recording ${i+1} has expected selected state.`);
   });
 }
 
 function spawnTest () {
   loadFrameScripts();
   let { target, toolbox, panel } = yield initPerformance(SIMPLE_URL);
-  let win = panel.panelWin;
-  let { $, EVENTS, gFront, PerformanceController, OverviewView, RecordingsView, WaterfallView } = win;
+  let { EVENTS, PerformanceController, OverviewView, RecordingsView, WaterfallView } = panel.panelWin;
 
   info("Starting console.profile()...");
-  yield consoleProfile(win);
-  testRecordings(win, [C+S+R]);
+  yield consoleProfile(panel.panelWin);
+  testRecordings(panel.panelWin, [C+S+R]);
   info("Starting manual recording...");
   yield startRecording(panel);
-  testRecordings(win, [C+R, R+S]);
+  testRecordings(panel.panelWin, [C+R, R+S]);
   info("Starting console.profile(\"3\")...");
-  yield consoleProfile(win, "3");
-  testRecordings(win, [C+R, R+S, C+R]);
+  yield consoleProfile(panel.panelWin, "3");
+  testRecordings(panel.panelWin, [C+R, R+S, C+R]);
   info("Starting console.profile(\"3\")...");
-  yield consoleProfile(win, "4");
-  testRecordings(win, [C+R, R+S, C+R, C+R]);
+  yield consoleProfile(panel.panelWin, "4");
+  testRecordings(panel.panelWin, [C+R, R+S, C+R, C+R]);
 
   info("Ending console.profileEnd()...");
-  yield consoleProfileEnd(win);
+  yield consoleProfileEnd(panel.panelWin);
 
-  testRecordings(win, [C+R, R+S, C+R, C]);
+  testRecordings(panel.panelWin, [C+R, R+S, C+R, C]);
   ok(OverviewView.isRendering(), "still rendering overview with manual recorded selected.");
 
   let onSelected = once(WaterfallView, EVENTS.WATERFALL_RENDERED);
   info("Select last recording...");
   RecordingsView.selectedIndex = 3;
   yield onSelected;
-  testRecordings(win, [C+R, R, C+R, C+S]);
+  testRecordings(panel.panelWin, [C+R, R, C+R, C+S]);
   ok(!OverviewView.isRendering(), "stop rendering overview when selected completed recording.");
 
   info("Manually stop manual recording...");
   yield stopRecording(panel);
-  testRecordings(win, [C+R, S, C+R, C]);
+  testRecordings(panel.panelWin, [C+R, S, C+R, C]);
   ok(!OverviewView.isRendering(), "stop rendering overview when selected completed recording.");
 
   onSelected = once(PerformanceController, EVENTS.RECORDING_SELECTED);
   info("Select first recording...");
   RecordingsView.selectedIndex = 0;
   yield onSelected;
-  testRecordings(win, [C+R+S, 0, C+R, C]);
+  testRecordings(panel.panelWin, [C+R+S, 0, C+R, C]);
   yield once(OverviewView, EVENTS.OVERVIEW_RENDERED);
   ok(OverviewView.isRendering(), "should be rendering overview when selected recording in progress.");
 
   info("Ending console.profileEnd()...");
-  yield consoleProfileEnd(win);
-  testRecordings(win, [C+R+S, 0, C, C]);
+  yield consoleProfileEnd(panel.panelWin);
+  testRecordings(panel.panelWin, [C+R+S, 0, C, C]);
   ok(OverviewView.isRendering(), "should still be rendering overview when selected recording in progress.");
   info("Start one more manual recording...");
   yield startRecording(panel);
-  testRecordings(win, [C+R, 0, C, C, R+S]);
+  testRecordings(panel.panelWin, [C+R, 0, C, C, R+S]);
   ok(OverviewView.isRendering(), "should be rendering overview when selected recording in progress.");
   info("Stop manual recording...");
   yield stopRecording(panel);
-  testRecordings(win, [C+R, 0, C, C, S]);
+  testRecordings(panel.panelWin, [C+R, 0, C, C, S]);
   ok(!OverviewView.isRendering(), "stop rendering overview when selected completed recording.");
 
   info("Ending console.profileEnd()...");
-  yield consoleProfileEnd(win);
-  testRecordings(win, [C, 0, C, C, S]);
+  yield consoleProfileEnd(panel.panelWin);
+  testRecordings(panel.panelWin, [C, 0, C, C, S]);
   ok(!OverviewView.isRendering(), "stop rendering overview when selected completed recording.");
 
   yield teardown(panel);
   finish();
 }