Bug 1176205: Fix typo breaking tests on aurora. r+a=RyanVM
authorDave Townsend <dtownsend@oxymoronical.com>
Tue, 30 Jun 2015 14:04:43 -0700
changeset 281363 4986c61eec61e991f402d8aaa5968f8964f4b1aa
parent 281362 00c94def1c35cd93a70bd9b0692c939981cea629
child 281364 305900080dba4edb96b76b5881a5418b19ec0e9c
push id4932
push userjlund@mozilla.com
push dateMon, 10 Aug 2015 18:23:06 +0000
treeherdermozilla-beta@6dd5a4f5f745 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1176205
milestone41.0a2
Bug 1176205: Fix typo breaking tests on aurora. r+a=RyanVM
browser/components/preferences/in-content/tests/browser.ini
browser/components/preferences/in-content/tests/browser_privacypane_5.js
browser/components/preferences/tests/browser.ini
browser/components/preferences/tests/browser_privacypane_5.js
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -17,17 +17,16 @@ skip-if = os != "win" # This test tests 
 [browser_connection_bug388287.js]
 [browser_healthreport.js]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_proxy_backup.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
 [browser_privacypane_5.js]
-skip-if = true # Bug 1176205 breaks this test on not-nightly
 [browser_privacypane_8.js]
 skip-if = e10s # Bug ?????? -  "leaked until shutdown [nsGlobalWindow #99 about:preferences]"
 [browser_sanitizeOnShutdown_prefLocked.js]
 [browser_subdialogs.js]
 skip-if = e10s # Bug 1087114
 support-files = subdialog.xul
 [browser_telemetry.js]
 # Skip this test on Android and B2G as FHR and Telemetry are separate systems there.
--- a/browser/components/preferences/in-content/tests/browser_privacypane_5.js
+++ b/browser/components/preferences/in-content/tests/browser_privacypane_5.js
@@ -16,12 +16,12 @@ function test() {
     test_locbar_suggestion_retention("history", true),
     test_locbar_suggestion_retention("bookmark", true),
     test_locbar_suggestion_retention("openpage", false),
     test_locbar_suggestion_retention("history", true),
     test_locbar_suggestion_retention("history", false),
   ];
 
   if (AppConstants.NIGHTLY_BUILD)
-    tests.push(test_locbar_suggestion_retention("searches", true)),
+    tests.push(test_locbar_suggestion_retention("searches", true));
 
   run_test_subset(tests);
 }
--- a/browser/components/preferences/tests/browser.ini
+++ b/browser/components/preferences/tests/browser.ini
@@ -14,13 +14,12 @@ skip-if = e10s # Bug 941459 - pushPrefEn
 [browser_healthreport.js]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_permissions.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
 skip-if = e10s # leaks windows
 [browser_privacypane_5.js]
-skip-if = true # Bug 1176205 breaks this test on not-nightly
 [browser_privacypane_8.js]
 [browser_telemetry.js]
 # Skip this test on Android and B2G as FHR and Telemetry are separate systems there.
 skip-if = !healthreport || !telemetry || (os == 'linux' && debug) || (os == 'android') || (os == 'b2g')
--- a/browser/components/preferences/tests/browser_privacypane_5.js
+++ b/browser/components/preferences/tests/browser_privacypane_5.js
@@ -16,12 +16,12 @@ function test() {
     test_locbar_suggestion_retention("history", true),
     test_locbar_suggestion_retention("bookmark", true),
     test_locbar_suggestion_retention("openpage", false),
     test_locbar_suggestion_retention("history", true),
     test_locbar_suggestion_retention("history", false),
   ];
 
   if (AppConstants.NIGHTLY_BUILD)
-    tests.push(test_locbar_suggestion_retention("searches", true)),
+    tests.push(test_locbar_suggestion_retention("searches", true));
 
   run_test_subset(tests);
 }