Bug 1381745 - Increase server and download timeout when updating SB lists r=hchang
authorThomas Nguyen <tnguyen@mozilla.com>
Mon, 24 Jul 2017 10:30:15 +0800
changeset 421664 acde5b9b7b2547701d87d21c0546e42b828b886c
parent 421663 d1521ab5024fed8fe53772892aa325db11221868
child 421665 b756c4d0b7ff8ccf28abd2f4d81c685f35d76561
push id1517
push userjlorenzo@mozilla.com
push dateThu, 14 Sep 2017 16:50:54 +0000
treeherdermozilla-release@3b41fd564418 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewershchang
bugs1381745
milestone56.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 1381745 - Increase server and download timeout when updating SB lists r=hchang 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
@@ -5343,19 +5343,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'))