From 4beb474637dbddb6b7d6493a5ed13af0f087a17e Mon Sep 17 00:00:00 2001 From: Marco Bonardo Date: Thu, 22 Jul 2010 14:08:50 +0200 Subject: [PATCH] Bug 575132 - Intermittent failure in browser_history_sidebar_search.js - skip unexpected pages --- .../tests/browser/browser_history_sidebar_search.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/browser/components/places/tests/browser/browser_history_sidebar_search.js b/browser/components/places/tests/browser/browser_history_sidebar_search.js index 44a6ff90b347..104db61b1fbd 100644 --- a/browser/components/places/tests/browser/browser_history_sidebar_search.js +++ b/browser/components/places/tests/browser/browser_history_sidebar_search.js @@ -129,11 +129,17 @@ function check_sidebar_tree_order(aExpectedRows) { var tree = sidebar.contentDocument.getElementById("historyTree"); var treeView = tree.view; var rc = treeView.rowCount; - is(rc, aExpectedRows, "All expected tree rows are present"); var columns = tree.columns; is(columns.count, 1, "There should be only 1 column in the sidebar"); + var found = 0; for (var r = 0; r < rc; r++) { var node = treeView.nodeForTreeIndex(r); + // We could inherit visits from previous tests, skip them since they are + // not interesting for us. + if (pages.indexOf(node.uri) == -1) + continue; is(node.uri, pages[r], "Node is in correct position based on its visit date"); + found++; } + ok(found, aExpectedRows, "Found all expected results"); }