зеркало из https://github.com/mozilla/gecko-dev.git
Add some logging to browserGlue random failing tests
This commit is contained in:
Родитель
4562ffc180
Коммит
9d4eb40b97
|
@ -125,11 +125,13 @@ function uri(spec) {
|
|||
function remove_all_bookmarks() {
|
||||
var bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
|
||||
getService(Ci.nsINavBookmarksService);
|
||||
// Clear all bookmarks
|
||||
// Clear all bookmarks.
|
||||
bs.removeFolderChildren(bs.bookmarksMenuFolder);
|
||||
bs.removeFolderChildren(bs.toolbarFolder);
|
||||
bs.removeFolderChildren(bs.unfiledBookmarksFolder);
|
||||
// Check for correct cleanup
|
||||
|
||||
// Check for correct cleanup.
|
||||
dump_table("moz_bookmarks");
|
||||
check_no_bookmarks()
|
||||
}
|
||||
|
||||
|
@ -148,7 +150,13 @@ function check_no_bookmarks() {
|
|||
var result = hs.executeQuery(query, options);
|
||||
var root = result.root;
|
||||
root.containerOpen = true;
|
||||
do_check_eq(root.childCount, 0);
|
||||
var cc = root.childCount;
|
||||
// Dump contents if found.
|
||||
for (var i = 0; i < cc ; i++) {
|
||||
var node = root.getChild(i);
|
||||
print("Found unexpected child at " + i + ": " + node.title);
|
||||
}
|
||||
do_check_eq(cc, 0);
|
||||
root.containerOpen = false;
|
||||
}
|
||||
|
||||
|
|
|
@ -106,6 +106,8 @@ function continue_test() {
|
|||
let bs = Cc["@mozilla.org/browser/nav-bookmarks-service;1"].
|
||||
getService(Ci.nsINavBookmarksService);
|
||||
|
||||
dump_table("moz_bookmarks");
|
||||
|
||||
// Check the custom bookmarks exist on menu.
|
||||
let menuItemId = bs.getIdForItemAt(bs.bookmarksMenuFolder, 0);
|
||||
do_check_neq(menuItemId, -1);
|
||||
|
|
|
@ -225,7 +225,8 @@ function next_test() {
|
|||
|
||||
// nsBrowserGlue stops observing topics after first notification,
|
||||
// so we add back the observer to test additional runs.
|
||||
os.addObserver(bg, TOPIC_PLACES_INIT_COMPLETE, false);
|
||||
if (testIndex > 0)
|
||||
os.addObserver(bg, TOPIC_PLACES_INIT_COMPLETE, false);
|
||||
|
||||
// Execute next test.
|
||||
let test = tests.shift();
|
||||
|
|
|
@ -186,6 +186,11 @@ function countFolderChildren(aFolderItemId) {
|
|||
var rootNode = hs.executeQuery(query, options).root;
|
||||
rootNode.containerOpen = true;
|
||||
var cc = rootNode.childCount;
|
||||
// Dump contents.
|
||||
for (var i = 0; i < cc ; i++) {
|
||||
var node = rootNode.getChild(i);
|
||||
print("Found child at " + i + ": " + node.title);
|
||||
}
|
||||
rootNode.containerOpen = false;
|
||||
return cc;
|
||||
}
|
||||
|
@ -201,7 +206,8 @@ var testIndex = 0;
|
|||
function next_test() {
|
||||
// nsBrowserGlue stops observing topics after first notification,
|
||||
// so we add back the observer to test additional runs.
|
||||
os.addObserver(bg, TOPIC_PLACES_INIT_COMPLETE, false);
|
||||
if (testIndex > 0)
|
||||
os.addObserver(bg, TOPIC_PLACES_INIT_COMPLETE, false);
|
||||
|
||||
// Execute next test.
|
||||
let test = tests.shift();
|
||||
|
@ -210,9 +216,6 @@ function next_test() {
|
|||
}
|
||||
|
||||
function run_test() {
|
||||
// XXX disabled due to bug 510219
|
||||
return;
|
||||
|
||||
// Clean up database from all bookmarks.
|
||||
remove_all_bookmarks();
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче