Bug 694409 - Suppress Telemetry notification in Mozmill tests. r=Standard8, a=Standard8.
authorMike Conley <mconley@mozilla.com>
Mon, 17 Oct 2011 11:46:02 -0400
changeset 9289 cab170bfadec5b619b7b04704d73d6b2c433283e
parent 9288 0d449996337bce261abb925c36d1ea0d3a977874
child 9290 c877359b9075a55c0d1484b6a0c6efd071b69839
push id230
push userbugzilla@standard8.plus.com
push dateTue, 08 Nov 2011 22:55:24 +0000
treeherdercomm-beta@63dad5648415 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersStandard8, Standard8
bugs694409
Bug 694409 - Suppress Telemetry notification in Mozmill tests. r=Standard8, a=Standard8.
mail/test/mozmill/migration-from-tb2/prefs.js
mail/test/mozmill/runtest.py
mailnews/test/performance/bloat/mailnewsTestPrefs.js
--- a/mail/test/mozmill/migration-from-tb2/prefs.js
+++ b/mail/test/mozmill/migration-from-tb2/prefs.js
@@ -99,9 +99,10 @@ user_pref("mailnews.tags.$label3.color",
 user_pref("mailnews.tags.$label3.tag", "Personal");
 user_pref("mailnews.tags.$label4.color", "#3333FF");
 user_pref("mailnews.tags.$label4.tag", "To Do");
 user_pref("mailnews.tags.$label5.color", "#993399");
 user_pref("mailnews.tags.$label5.tag", "Later");
 user_pref("mailnews.tags.version", 2);
 user_pref("mailnews.ui.threadpane.version", 5);
 user_pref("pref.downloads.disable_button.edit_actions", false);
+user_pref("toolkit.telemetry.prompted", true);
 user_pref("wallet.caveat", true);
--- a/mail/test/mozmill/runtest.py
+++ b/mail/test/mozmill/runtest.py
@@ -153,17 +153,19 @@ class ThunderTestProfile(mozrunner.Thund
         'mailnews.start_page_override.mstone' :  "ignore",
         'mailnews.start_page.url': "about:blank",
         # Do not enable gloda
         'mailnews.database.global.indexer.enabled': False,
         # But do have gloda log if it does anything.  (When disabled, queries
         # are still serviced; they just should not result in any matches.)
         'mailnews.database.global.logging.upstream': True,
         # Do not allow fonts to be upgraded
-        'mail.font.windows.version': 2
+        'mail.font.windows.version': 2,
+        # No, we don't want to be prompted about Telemetry
+        'toolkit.telemetry.prompted': True,
         }
 
     # Dummied up local accounts to stop the account wizard
     account_preferences = {
         'mail.account.account1.server' :  "server1",
         'mail.account.account2.identities' :  "id1,id2",
         'mail.account.account2.server' :  "server2",
         'mail.accountmanager.accounts' :  "account1,account2",
--- a/mailnews/test/performance/bloat/mailnewsTestPrefs.js
+++ b/mailnews/test/performance/bloat/mailnewsTestPrefs.js
@@ -39,8 +39,10 @@ user_pref("mail.shell.checkDefaultClient
 user_pref("mail.winsearch.enable", false);
 user_pref("mail.winsearch.firstRunDone", true);
 user_pref("mail.spotlight.enable", false);
 user_pref("mail.spotlight.firstRunDone", true);
 user_pref("mailnews.database.global.indexer.enabled", false);
 // Ensure OS X and Outlook/OE books are disabled
 user_pref("ldap_2.servers.osx.position", 0);
 user_pref("ldap_2.servers.oe.position", 0);
+// Suppress Telemetry opt-in prompt
+user_pref("toolkit.telemetry.prompted", true);