Bug 1081343 followup: skip the tests for non-Nightly builds, and ifdef more of nsBrowserGlue.js/firefox.js
authorGavin Sharp <gavin@gavinsharp.com>
Tue, 28 Oct 2014 09:55:14 -0700
changeset 212975 11ac1ea74328ad5a245bef8054b014cd39696fb2
parent 212974 56849e75ceadfae8c8c20e7edbda96a203622287
child 212976 42a1ca26cbf90b8b2323aecb3f3048ae81381c63
push id51106
push userryanvm@gmail.com
push dateWed, 29 Oct 2014 20:52:00 +0000
treeherdermozilla-inbound@8512443e6e4f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1081343
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 1081343 followup: skip the tests for non-Nightly builds, and ifdef more of nsBrowserGlue.js/firefox.js
browser/app/profile/firefox.js
browser/components/nsBrowserGlue.js
browser/components/test/browser_polaris_prefs.js
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1759,17 +1759,19 @@ pref("experiments.manifest.uri", "https:
 // Whether experiments are supported by the current application profile.
 pref("experiments.supported", true);
 
 // Enable the OpenH264 plugin support in the addon manager.
 pref("media.gmp-gmpopenh264.provider.enabled", true);
 
 pref("browser.apps.URL", "https://marketplace.firefox.com/discovery/");
 
+#ifdef NIGHTLY_BUILD
 pref("browser.polaris.enabled", false);
 pref("privacy.trackingprotection.ui.enabled", false);
+#endif
 
 // Temporary pref to allow printing in e10s windows on some platforms.
 #ifdef UNIX_BUT_NOT_MAC
 pref("print.enable_e10s_testing", false);
 #else
 pref("print.enable_e10s_testing", true);
 #endif
--- a/browser/components/nsBrowserGlue.js
+++ b/browser/components/nsBrowserGlue.js
@@ -396,23 +396,25 @@ BrowserGlue.prototype = {
           ss.currentEngine = ss.defaultEngine;
         break;
       case "browser-search-service":
         if (data != "init-complete")
           return;
         Services.obs.removeObserver(this, "browser-search-service");
         this._syncSearchEngines();
         break;
+#ifdef NIGHTLY_BUILD
       case "nsPref:changed":
         if (data == POLARIS_ENABLED) {
           let enabled = Services.prefs.getBoolPref(POLARIS_ENABLED);
           Services.prefs.setBoolPref("privacy.donottrackheader.enabled", enabled);
           Services.prefs.setBoolPref("privacy.trackingprotection.enabled", enabled);
           Services.prefs.setBoolPref("privacy.trackingprotection.ui.enabled", enabled);
         }
+#endif
     }
   },
 
   _syncSearchEngines: function () {
     // Only do this if the search service is already initialized. This function
     // gets called in finalUIStartup and from a browser-search-service observer,
     // to catch both cases (search service initialization occurring before and
     // after final-ui-startup)
--- a/browser/components/test/browser_polaris_prefs.js
+++ b/browser/components/test/browser_polaris_prefs.js
@@ -18,34 +18,50 @@ function* assertPref(pref, enabled) {
 };
 
 function* testPrefs(test) {
   for (let pref of prefs) {
     yield test(pref);
   }
 }
 
+function isNightly() {
+  return Services.appinfo.version.contains("a1");
+}
+
 add_task(function* test_default_values() {
+  if (!isNightly()) {
+    ok(true, "Skipping test, not Nightly")
+    return;
+  }
   Assert.ok(!Services.prefs.getBoolPref(POLARIS_ENABLED), POLARIS_ENABLED + " is disabled by default.");
   Assert.ok(!Services.prefs.getBoolPref(PREF_TPUI), PREF_TPUI + "is disabled by default.");
 });
 
 add_task(function* test_changing_pref_changes_tracking() {
+  if (!isNightly()) {
+    ok(true, "Skipping test, not Nightly")
+    return;
+  }
   function* testPref(pref) {
     Services.prefs.setBoolPref(POLARIS_ENABLED, true);
     yield assertPref(pref, true);
     Services.prefs.setBoolPref(POLARIS_ENABLED, false);
     yield assertPref(pref, false);
     Services.prefs.setBoolPref(POLARIS_ENABLED, true);
     yield assertPref(pref, true);
   }
   yield testPrefs(testPref);
 });
 
 add_task(function* test_prefs_can_be_changed_individually() {
+  if (!isNightly()) {
+    ok(true, "Skipping test, not Nightly")
+    return;
+  }
   function* testPref(pref) {
     Services.prefs.setBoolPref(POLARIS_ENABLED, true);
     yield assertPref(pref, true);
     Services.prefs.setBoolPref(pref, false);
     yield assertPref(pref, false);
     yield assertPref(POLARIS_ENABLED, true);
     Services.prefs.setBoolPref(POLARIS_ENABLED, false);
     yield assertPref(pref, false);