774296 - [SeaMonkey] "test_browserGlue_smartBookmarks.js | 6 == 5"

Status: RESOLVED FIXED

(SeaMonkey :: Bookmarks & History, defect, P2)

Description

[Serge Gautherie (:sgautherie)]

http://tinderbox.mozilla.org/showlog.cgi?log=SeaMonkey/1341926455.1341929207.9433.gz
WINNT 5.2 comm-central-trunk debug test xpcshell on 2012/07/10 06:20:55
{
TEST-PASS | e:/builds/slave/test/build/xpcshell/tests/suite/common/places/tests/unit/test_browserGlue_smartBookmarks.js | [null : 58] 5 == 5
Found child(0): Recently Bookmarked
Found child(1): Recent Tags
Found child(2): ---
Found child(3): SeaMonkey and Mozilla
Found child(4): Search the Web
Found child(5): ---

TEST-UNEXPECTED-FAIL | e:/builds/slave/test/build/xpcshell/tests/suite/common/places/tests/unit/test_browserGlue_smartBookmarks.js | 6 == 5 - See following stack:
JS frame :: e:\builds\slave\test\build\xpcshell\head.js :: do_throw :: line 451
JS frame :: e:\builds\slave\test\build\xpcshell\head.js :: _do_check_eq :: line 545
JS frame :: e:\builds\slave\test\build\xpcshell\head.js :: do_check_eq :: line 566
JS frame :: e:/builds/slave/test/build/xpcshell/tests/suite/common/places/tests/unit/test_browserGlue_smartBookmarks.js :: <TOP_LEVEL> :: line 60
JS frame :: e:/builds/slave/test/build/xpcshell/tests/suite/common/places/tests/unit/test_browserGlue_smartBookmarks.js :: next_test :: line 303

 Skipping 1980 Lines...
}

Currently, "Found child(5): ---" is not accounted for.
Need to investigate (recent) history a little to explain it.
(And maybe check what Firefox has.)

***

http://mxr.mozilla.org/comm-central/source/suite/common/places/tests/unit/head_bookmarks.js#74
68 // 3 = "Recently Bookmarked", "Recent Tags", separator.
69 const SMART_BOOKMARKS_ON_MENU = 3; // Takes in count the additional separator.
74 // 2 = "SeaMonkey and Mozilla", "Search the Web".
75 const DEFAULT_BOOKMARKS_ON_MENU = 2;

http://mxr.mozilla.org/comm-central/source/suite/locales/generic/profile/bookmarks.html.in#24
24     <DT><H3>@seamonkey_and_mozilla@</H3>
50 #include bookmarks.extra
51     <HR>

http://mxr.mozilla.org/comm-central/source/suite/locales/en-US/profile/bookmarks.extra#10
10     <DT><H3>Search the Web</H3>

Comment 1

[Frank Wein [:mcsmurf]]

Attachment: Patch

This patch basically reverts the test fix from Bug 739041 as Bug 767776 fixed the bookmarks importer to include the <hr> separator again.

Comment 2

[Frank Wein [:mcsmurf]]

As an additional explanation: This seperator (http://hg.mozilla.org/comm-central/annotate/01b400c03e9b/suite/locales/generic/profile/bookmarks.html.in#l51) is meant in the patch.

Comment 3

[Ian Neal]

Comment on attachment 690092 [details] [diff] [review]
Patch

Sorry for the delay r=me

Comment 4

[Frank Wein [:mcsmurf]]

Pushed: https://hg.mozilla.org/comm-central/rev/2b20e1c4a3da