corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1421500 - Disable back-off for SafeBrowsing testcases not testing back-off. r=francois

Browse Source 
After this patch landed, we will have 3 cases:
1. For providers are not "test", for example, google, google4, mozilla ... etc
   backoff CANNOT be disabled.
2. For "test" provider, if preference "browser.safebrowsing.provider.test.disableBackoff" is ON
   backoff is disabled.
3. For "test" provider, if preference "browser.safebrowsing.provider.test.disableBackoff" is Off
   backoff is NOT disabled.

So if your testcase will use listmanager or hashcompleter, you should try to use "test" provider
if possible, otherwise testcase may encounter intermittent failure due to backoff.

MozReview-Commit-ID: 3BDxs0ARyQM
This commit is contained in:
DimiL
2017-12-08 12:18:34 +08:00
parent 727aa24b72
commit 8971ba69f6
5 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
toolkit/components/url-classifier/nsUrlClassifierLib.js
View File

@@ -8,10 +8,13 @@
const Cc = Components.classes;
const Ci = Components.interfaces;
const Cu = Components.utils;
const G_GDEBUG = false;
Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/XPCOMUtils.jsm");
Cu.import("resource://gre/modules/Services.jsm");
const PREF_DISABLE_TEST_BACKOFF = "browser.safebrowsing.provider.test.disableBackoff";
/**
* Partially applies a function to a particular "this object" and zero or
* more arguments. The result is a new function with some arguments of the first
@@ -83,7 +86,7 @@ this.RequestBackoff =
function RequestBackoff(maxErrors, retryIncrement,
maxRequests, requestPeriod,
timeoutIncrement, maxTimeout,
tolerance) {
tolerance, provider = null) {
this.MAX_ERRORS_ = maxErrors;
this.RETRY_INCREMENT_ = retryIncrement;
this.MAX_REQUESTS_ = maxRequests;
@@ -98,6 +101,17 @@ function RequestBackoff(maxErrors, retryIncrement,
this.numErrors_ = 0;
this.errorTimeout_ = 0;
this.nextRequestTime_ = 0;
// For test provider, we will disable backoff if preference is set to false.
if (provider === "test") {
this.canMakeRequestDefault = this.canMakeRequest;
this.canMakeRequest = function () {
if (Services.prefs.getBoolPref(PREF_DISABLE_TEST_BACKOFF, true)) {
return true;
}
return this.canMakeRequestDefault();
}
}
};
/**
@@ -175,7 +189,8 @@ RequestBackoff.prototype.isErrorStatus = function(status) {
// since both listmanager and hashcompleter would use it.
// Note that |maxRequests| and |requestPeriod| is still configurable
// to throttle pending requests.
function RequestBackoffV4(maxRequests, requestPeriod) {
function RequestBackoffV4(maxRequests, requestPeriod,
provider = null) {
let rand = Math.random();
let retryInterval = Math.floor(15 * 60 * 1000 * (rand + 1)); // 15 ~ 30 min.
let backoffInterval = Math.floor(30 * 60 * 1000 * (rand + 1)); // 30 ~ 60 min.
@@ -186,7 +201,8 @@ function RequestBackoffV4(maxRequests, requestPeriod) {
requestPeriod /* request time, 60 min */,
backoffInterval /* backoff interval, 60 min */,
24 * 60 * 60 * 1000 /* max backoff, 24hr */,
1000 /* tolerance of 1 sec */);
1000 /* tolerance of 1 sec */,
provider /* provider name */);
}
// Expose this whole component.