Bug 997820 - part 1.1 - really disable telemetry during reftests; r=ted
authorNathan Froyd <froydnj@mozilla.com>
Thu, 24 Apr 2014 09:37:21 -0400
changeset 180530 4797c2555c1b9dbcccdbae033393e1d38fa43ebb
parent 180529 30f8577510eac44e29f94b7c0ae1b78c3bd38274
child 180531 9bb8fb4f73f83165ab76a3008b9c8419c18973cd
push id42799
push usernfroyd@mozilla.com
push dateMon, 28 Apr 2014 13:02:29 +0000
treeherdermozilla-inbound@9bb8fb4f73f8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs997820
milestone31.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 997820 - part 1.1 - really disable telemetry during reftests; r=ted
layout/tools/reftest/reftest-preferences.js
layout/tools/reftest/runreftest.py
--- a/layout/tools/reftest/reftest-preferences.js
+++ b/layout/tools/reftest/reftest-preferences.js
@@ -41,10 +41,8 @@
     // Disable interruptible reflow since (1) it's normally not going to
     // happen, but (2) it might happen if we somehow end up with both
     // pending user events and clock skew.  So to avoid having to change
     // MakeProgress to deal with waiting for interruptible reflows to
     // complete for a rare edge case, we just disable interruptible
     // reflow so that that rare edge case doesn't lead to reftest
     // failures.
     branch.setBoolPref("layout.interruptible-reflow.enabled", false);
-    // Don't try to connect to the telemetry server.
-    branch.setBoolPref("toolkit.telemetry.enabled", false);
--- a/layout/tools/reftest/runreftest.py
+++ b/layout/tools/reftest/runreftest.py
@@ -160,16 +160,20 @@ class RefTest(object):
     if options.ignoreWindowSize:
       prefs['reftest.ignoreWindowSize'] = True
     if options.filter:
       prefs['reftest.filter'] = options.filter
     if options.shuffle:
       prefs['reftest.shuffle'] = True
     prefs['reftest.focusFilterMode'] = options.focusFilterMode
 
+    # Ensure that telemetry is disabled, so we don't connect to the telemetry
+    # server in the middle of the tests.
+    prefs['toolkit.telemetry.enabled'] = False
+
     if options.e10s:
       prefs['browser.tabs.remote.autostart'] = True
 
     for v in options.extraPrefs:
       thispref = v.split('=')
       if len(thispref) < 2:
         print "Error: syntax error in --setpref=" + v
         sys.exit(1)