Bug 1381745 - Increase server and download timeout when updating SB lists draft
authorThomas Nguyen <tnguyen@mozilla.com>
Mon, 24 Jul 2017 10:30:15 +0800
changeset 614082 f7797e535c515689a5c46db84a23938b6c9347a1
parent 612696 7d2e89fb92331d7e4296391213c1e63db628e046
child 638773 41ce9db4cad20c4b4eec9f594c4198b038feb1b7
push id69910
push userbmo:tnguyen@mozilla.com
push dateMon, 24 Jul 2017 02:30:56 +0000
bugs1381745
milestone56.0a1
Bug 1381745 - Increase server and download timeout when updating SB lists MozReview-Commit-ID: IRXb9QiMYwJ
modules/libpref/init/all.js
testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
--- a/modules/libpref/init/all.js
+++ b/modules/libpref/init/all.js
@@ -5320,19 +5320,19 @@ pref("urlclassifier.trackingTable", "tes
 pref("urlclassifier.trackingWhitelistTable", "test-trackwhite-simple,mozstd-trackwhite-digest256");
 
 // The number of random entries to send with a gethash request.
 pref("urlclassifier.gethashnoise", 4);
 
 // Gethash timeout for Safebrowsing.
 pref("urlclassifier.gethash.timeout_ms", 5000);
 // Update server response timeout for Safebrowsing.
-pref("urlclassifier.update.response_timeout_ms", 15000);
+pref("urlclassifier.update.response_timeout_ms", 30000);
 // Download update timeout for Safebrowsing.
-pref("urlclassifier.update.timeout_ms", 60000);
+pref("urlclassifier.update.timeout_ms", 90000);
 
 // Name of the about: page contributed by safebrowsing to handle display of error
 // pages on phishing/malware hits.  (bug 399233)
 pref("urlclassifier.alternate_error_page", "blocked");
 
 // Enable phishing protection
 pref("browser.safebrowsing.phishing.enabled", true);
 
--- a/testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
+++ b/testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py
@@ -93,17 +93,17 @@ class TestSafeBrowsingInitialDownload(Pu
             super(TestSafeBrowsingInitialDownload, self).tearDown()
 
     def test_safe_browsing_initial_download(self):
         def check_downloaded(_):
             return reduce(lambda state, pref: state and int(self.marionette.get_pref(pref)) != 1,
                           self.prefs_provider_update_time.keys(), True)
 
         try:
-            Wait(self.marionette, timeout=90).until(
+            Wait(self.marionette, timeout=170).until(
                 check_downloaded, message='Not all safebrowsing files have been downloaded')
         finally:
             files_on_disk_toplevel = os.listdir(self.safebrowsing_path)
             for f in self.safebrowsing_v2_files:
                 self.assertIn(f, files_on_disk_toplevel)
 
             if len(self.safebrowsing_v4_files) > 0:
                 files_on_disk_google4 = os.listdir(os.path.join(self.safebrowsing_path, 'google4'))