Bug 1401129 - Restore datareporting.healthreport.about.reportUrl in automation tools. r?whimboo draft
authorAndreas Tolfsen <ato@sny.no>
Thu, 08 Mar 2018 15:32:06 +0000
changeset 766191 7ee4af16446f0bb17e346d0d54c9724d6f8bb868
parent 766174 fdd1a0082c71673239fc2f3a6a93de889c07a1be
child 766192 95594c605c7ce38ba966e1f63008791236a831e2
push id102248
push userbmo:ato@sny.no
push dateMon, 12 Mar 2018 11:49:43 +0000
reviewerswhimboo
bugs1401129, 1352497
milestone60.0a1
Bug 1401129 - Restore datareporting.healthreport.about.reportUrl in automation tools. r?whimboo The datareporting.healthreport.about.reportUrl preference was removed in bug 1352497, but there are multiple automation tools in the tree that target out-of-tree release channels. This patch restores the preference with a note that it was removed in Firefox 59. MozReview-Commit-ID: Lg8bxoiIfxn
testing/geckodriver/src/prefs.rs
testing/marionette/client/marionette_driver/geckoinstance.py
--- a/testing/geckodriver/src/prefs.rs
+++ b/testing/geckodriver/src/prefs.rs
@@ -1,12 +1,12 @@
 use mozprofile::preferences::Pref;
 
 lazy_static! {
-    pub static ref DEFAULT: [(&'static str, Pref); 78] = [
+    pub static ref DEFAULT: [(&'static str, Pref); 79] = [
         // Disable automatic downloading of new releases
         ("app.update.auto", Pref::new(false)),
 
         // Disable automatically upgrading Firefox
         ("app.update.enabled", Pref::new(false)),
 
         // Increase the APZ content response timeout in tests to 1
         // minute.  This is to accommodate the fact that test environments
@@ -105,16 +105,17 @@ lazy_static! {
         // tests that don't expect it to be there.
         ("browser.urlbar.userMadeSearchSuggestionsChoice", Pref::new(true)),
 
         // Do not warn on quitting Firefox
         ("browser.warnOnQuit", Pref::new(false)),
 
         // Do not show datareporting policy notifications which can
         // interfere with tests
+        ("datareporting.healthreport.about.reportUrl", Pref::new("http://%(server)s/dummy/abouthealthreport/")),  // removed in Firefox 59
         ("datareporting.healthreport.documentServerURI", Pref::new("http://%(server)s/dummy/healthreport/")),
         ("datareporting.healthreport.logging.consoleEnabled", Pref::new(false)),
         ("datareporting.healthreport.service.enabled", Pref::new(false)),
         ("datareporting.healthreport.service.firstRun", Pref::new(false)),
         ("datareporting.healthreport.uploadEnabled", Pref::new(false)),
         ("datareporting.policy.dataSubmissionEnabled", Pref::new(false)),
         ("datareporting.policy.dataSubmissionPolicyAccepted", Pref::new(false)),
         ("datareporting.policy.dataSubmissionPolicyBypassNotification", Pref::new(true)),
--- a/testing/marionette/client/marionette_driver/geckoinstance.py
+++ b/testing/marionette/client/marionette_driver/geckoinstance.py
@@ -28,16 +28,18 @@ class GeckoInstance(object):
         # This is to accommodate the fact that test environments tends to be slower
         # than production environments (with the b2g emulator being the slowest of them
         # all), resulting in the production timeout value sometimes being exceeded
         # and causing false-positive test failures. See bug 1176798, bug 1177018,
         # bug 1210465.
         "apz.content_response_timeout": 60000,
 
         # Do not send Firefox health reports to the production server
+        # removed in Firefox 59
+        "datareporting.healthreport.about.reportUrl": "http://%(server)s/dummy/abouthealthreport/",
         "datareporting.healthreport.documentServerURI": "http://%(server)s/dummy/healthreport/",
 
         # Do not show datareporting policy notifications which can interfer with tests
         "datareporting.policy.dataSubmissionPolicyBypassNotification": True,
 
         "dom.ipc.reportProcessHangs": False,
 
         # No slow script dialogs