Bug 1066086 - Attempt to fix intermittent browser_timeline_waterfall-generic.js by checking if marker sidebar or waterfall nodes aren't spacers. r=vporof
authorVictor Porof <vporof@mozilla.com>
Thu, 18 Sep 2014 14:20:43 -0400
changeset 206159 922368bec251bf367257796a6297ca6ca6189560
parent 206158 5ac8150b6745644dc5f19591fba05b3995748564
child 206160 cb1f250550ff76652ee86bee3786d89095f1ee46
push id27514
push usercbook@mozilla.com
push dateFri, 19 Sep 2014 12:24:09 +0000
treeherdermozilla-central@3475e6a1665a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersvporof
bugs1066086
milestone35.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 1066086 - Attempt to fix intermittent browser_timeline_waterfall-generic.js by checking if marker sidebar or waterfall nodes aren't spacers. r=vporof
browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
--- a/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
+++ b/browser/devtools/timeline/test/browser_timeline_waterfall-generic.js
@@ -46,23 +46,23 @@ let test = Task.async(function*() {
 
   ok($(".timeline-marker-container"),
     "A marker container should have been created.");
 
   // Test the markers sidebar (left).
 
   ok($$(".timeline-marker-sidebar").length,
     "Some marker sidebar nodes should have been created.");
-  ok($$(".timeline-marker-sidebar > .timeline-marker-bullet").length,
+  ok($$(".timeline-marker-sidebar:not(spacer) > .timeline-marker-bullet").length,
     "Some marker color bullets should have been created inside the sidebar.");
-  ok($$(".timeline-marker-sidebar > .timeline-marker-name").length,
+  ok($$(".timeline-marker-sidebar:not(spacer) > .timeline-marker-name").length,
     "Some marker name labels should have been created inside the sidebar.");
 
   // Test the markers waterfall (right).
 
   ok($$(".timeline-marker-waterfall").length,
     "Some marker waterfall nodes should have been created.");
-  ok($$(".timeline-marker-waterfall > .timeline-marker-bar").length,
+  ok($$(".timeline-marker-waterfall:not(spacer) > .timeline-marker-bar").length,
     "Some marker color bars should have been created inside the waterfall.");
 
   yield teardown(panel);
   finish();
 });