Bug 1080801 - re-enable the working urlbar tests, rs=gavin
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Wed, 05 Nov 2014 00:33:02 +0000
changeset 214178 79d73c3b0b07bb860d3d334a59fe945b3729f497
parent 214177 28de06bbcdda4a2b8b7a17fe4b15afd10726dbd4
child 214179 80a1da90e09349afc79755211fff7bedec519e9f
push id27773
push userryanvm@gmail.com
push dateWed, 05 Nov 2014 20:05:41 +0000
treeherdermozilla-central@b6cd2dd85b26 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgavin
bugs1080801
milestone36.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 1080801 - re-enable the working urlbar tests, rs=gavin
browser/base/content/test/general/browser.ini
browser/base/content/test/general/browser_urlHighlight.js
--- a/browser/base/content/test/general/browser.ini
+++ b/browser/base/content/test/general/browser.ini
@@ -444,32 +444,29 @@ skip-if = e10s # Bug 1093155 - tries to 
 support-files =
   trackingPage.html
   benignPage.html
 [browser_typeAheadFind.js]
 skip-if = buildapp == 'mulet' || e10s # Bug 921935 - focusmanager issues with e10s (test calls waitForFocus)
 [browser_unloaddialogs.js]
 skip-if = e10s # Bug ?????? - test uses chrome windowMediator to try and see alert() from content
 [browser_urlHighlight.js]
-skip-if = e10s
 [browser_urlbarAutoFillTrimURLs.js]
 skip-if = e10s # Bug 1093941 - Waits indefinitely for onSearchComplete
 [browser_urlbarCopying.js]
 skip-if = e10s # Bug 1069757 - browser_urlbarCopying.js needs e10s love.
 [browser_urlbarEnter.js]
 skip-if = e10s # Bug 1093941 - used to cause obscure non-windows child process crashes on try
 [browser_urlbarRevert.js]
 skip-if = e10s # Bug 1093941 - ESC reverted the location bar value - Got foobar, expected example.com
 [browser_urlbarSearchSingleWordNotification.js]
 [browser_urlbarStop.js]
 skip-if = e10s # Bug 1093941 - test calls gBrowser.contentWindow.stop
 [browser_urlbarTrimURLs.js]
-skip-if = e10s
 [browser_urlbar_search_healthreport.js]
-skip-if = e10s # Bug ?????? - FHR tests failing (either with "no data for today" or "2 records for today")
 [browser_utilityOverlay.js]
 [browser_visibleFindSelection.js]
 skip-if = e10s # Bug ?????? - test directly manipulates content
 [browser_visibleLabel.js]
 [browser_visibleTabs.js]
 [browser_visibleTabs_bookmarkAllPages.js]
 skip-if = true # Bug 1005420 - fails intermittently. also with e10s enabled: bizarre problem with hidden tab having _mouseenter called, via _setPositionalAttributes, and tab not being found resulting in 'candidate is undefined'
 [browser_visibleTabs_bookmarkAllTabs.js]
--- a/browser/base/content/test/general/browser_urlHighlight.js
+++ b/browser/base/content/test/general/browser_urlHighlight.js
@@ -11,17 +11,17 @@ function testVal(aExpected) {
   let result = "";
   for (let i = 0; i < selection.rangeCount; i++) {
     let range = selection.getRangeAt(i).toString();
     let pos = value.indexOf(range);
     result += value.substring(0, pos) + "<" + range + ">";
     value = value.substring(pos + range.length);
   }
   result += value;
-  is(result, aExpected);
+  is(result, aExpected, "Correct part of the urlbar contents is highlighted");
 }
 
 function test() {
   const prefname = "browser.urlbar.formatting.enabled";
 
   registerCleanupFunction(function () {
     Services.prefs.clearUserPref(prefname);
     URLBarSetURI();