Bug 1357676 - Modify failed tests r=jdm

We've introduced a new pref network.cookie.quotaPerHost and also a rule that the value of network.cookie.maxPerHost should always be bigger than network.cookie.quotaPerHost. So, before changing the value of network.cookie.maxPerHost, we have to set network.cookie.quotaPerHost first.
This patch only sets network.cookie.quotaPerHost equal to network.cookie.maxPerHost - 1 in all failed tests.

Differential Revision: https://phabricator.services.mozilla.com/D4346

--HG--
extra : moz-landing-system : lando

extensions/cookie/test/unit/test_domain_eviction.js

@@ -19,6 +19,9 @@ function continue_test()
 
 function* do_run_test()
 {
+  // Set quotaPerHost to maxPerHost - 1, so there is only one cookie
+  // will be evicted everytime.
+  Services.prefs.setIntPref("network.cookie.quotaPerHost", 49);
   // Set the base domain limit to 50 so we have a known value.
   Services.prefs.setIntPref("network.cookie.maxPerHost", 50);
 

netwerk/test/TestCookie.cpp

@@ -30,6 +30,7 @@ static NS_DEFINE_CID(kPrefServiceCID,   NS_PREFSERVICE_CID);
 
 // various pref strings
 static const char kCookiesPermissions[] = "network.cookie.cookieBehavior";
+static const char kPrefCookieQuotaPerHost[] = "network.cookie.quotaPerHost";
 static const char kCookiesMaxPerHost[] = "network.cookie.maxPerHost";
 static const char kCookieLeaveSecurityAlone[] = "network.cookie.leave-secure-alone";
 
@@ -179,6 +180,9 @@ InitPrefs(nsIPrefBranch *aPrefBranch)
     // however, we don't test third party blocking here.
     aPrefBranch->SetIntPref(kCookiesPermissions, 0); // accept all
     aPrefBranch->SetBoolPref(kCookieLeaveSecurityAlone, true);
+    // Set quotaPerHost to maxPerHost - 1, so there is only one cookie
+    // will be evicted everytime.
+    aPrefBranch->SetIntPref(kPrefCookieQuotaPerHost, 49);
     // Set the base domain limit to 50 so we have a known value.
     aPrefBranch->SetIntPref(kCookiesMaxPerHost, 50);
 }

toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_bad.html

@@ -17,8 +17,13 @@
 add_task(async function init() {
   // We need to trigger a cookie eviction in order to test our batch delete
   // observer.
+
+  // Set quotaPerHost to maxPerHost - 1, so there is only one cookie
+  // will be evicted everytime.
+  SpecialPowers.setIntPref("network.cookie.quotaPerHost", 2);
   SpecialPowers.setIntPref("network.cookie.maxPerHost", 3);
   SimpleTest.registerCleanupFunction(() => {
+    SpecialPowers.clearUserPref("network.cookie.quotaPerHost");
     SpecialPowers.clearUserPref("network.cookie.maxPerHost");
   });
 });

toolkit/components/extensions/test/mochitest/test_ext_cookies_permissions_good.html

@@ -17,8 +17,13 @@
 add_task(async function init() {
   // We need to trigger a cookie eviction in order to test our batch delete
   // observer.
+
+  // Set quotaPerHost to maxPerHost - 1, so there is only one cookie
+  // will be evicted everytime.
+  SpecialPowers.setIntPref("network.cookie.quotaPerHost", 2);
   SpecialPowers.setIntPref("network.cookie.maxPerHost", 3);
   SimpleTest.registerCleanupFunction(() => {
+    SpecialPowers.clearUserPref("network.cookie.quotaPerHost");
     SpecialPowers.clearUserPref("network.cookie.maxPerHost");
   });
 });