From 62236a7f7985ca869fce4ee55928adf33ea77e23 Mon Sep 17 00:00:00 2001
From: Andrea Marchesini <amarchesini@mozilla.com>
Date: Fri, 17 May 2019 11:20:19 +0000
Subject: [PATCH] Bug 1550050 - Fix intermittent failures in
 test_same_base_domain_3.html forcing no cache via HTTP headers, r=valentin

At the end of each test, file_chromecommon.js deletes all the cookies, but it
doesn't invalidate the network cache. Some of the files are shared between
tests. When they are loaded from the cache, we don't set the cookies and,
because of this, the tests were reporting a wrong cookie number.

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

--HG--
extra : moz-landing-system : lando
---
 .../test/mochitests/file_domain_hierarchy_inner.html^headers^  | 3 +++
 .../mochitests/file_domain_hierarchy_inner_inner.html^headers^ | 3 +++
 netwerk/test/mochitests/file_domain_inner.html^headers^        | 3 +++
 netwerk/test/mochitests/file_domain_inner_inner.html^headers^  | 3 +++
 netwerk/test/mochitests/file_image_inner.html^headers^         | 3 +++
 netwerk/test/mochitests/file_image_inner_inner.html^headers^   | 3 +++
 netwerk/test/mochitests/file_loadflags_inner.html^headers^     | 3 +++
 netwerk/test/mochitests/file_localhost_inner.html^headers^     | 3 +++
 netwerk/test/mochitests/file_loopback_inner.html^headers^      | 3 +++
 netwerk/test/mochitests/file_subdomain_inner.html^headers^     | 3 +++
 netwerk/test/mochitests/test_same_base_domain.html             | 2 +-
 netwerk/test/mochitests/test_same_base_domain_3.html           | 2 +-
 netwerk/test/mochitests/test_same_base_domain_5.html           | 2 +-
 netwerk/test/mochitests/test_samedomain.html                   | 2 +-
 14 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/netwerk/test/mochitests/file_domain_hierarchy_inner.html^headers^ b/netwerk/test/mochitests/file_domain_hierarchy_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_domain_hierarchy_inner.html^headers^
+++ b/netwerk/test/mochitests/file_domain_hierarchy_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html^headers^ b/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html^headers^
index 405494cd6e78..1ab9133473a3 100644
--- a/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html^headers^
+++ b/netwerk/test/mochitests/file_domain_hierarchy_inner_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta2=tag2
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_domain_inner.html^headers^ b/netwerk/test/mochitests/file_domain_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_domain_inner.html^headers^
+++ b/netwerk/test/mochitests/file_domain_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_domain_inner_inner.html^headers^ b/netwerk/test/mochitests/file_domain_inner_inner.html^headers^
index 405494cd6e78..1ab9133473a3 100644
--- a/netwerk/test/mochitests/file_domain_inner_inner.html^headers^
+++ b/netwerk/test/mochitests/file_domain_inner_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta2=tag2
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_image_inner.html^headers^ b/netwerk/test/mochitests/file_image_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_image_inner.html^headers^
+++ b/netwerk/test/mochitests/file_image_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_image_inner_inner.html^headers^ b/netwerk/test/mochitests/file_image_inner_inner.html^headers^
index 405494cd6e78..1ab9133473a3 100644
--- a/netwerk/test/mochitests/file_image_inner_inner.html^headers^
+++ b/netwerk/test/mochitests/file_image_inner_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta2=tag2
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_loadflags_inner.html^headers^ b/netwerk/test/mochitests/file_loadflags_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_loadflags_inner.html^headers^
+++ b/netwerk/test/mochitests/file_loadflags_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_localhost_inner.html^headers^ b/netwerk/test/mochitests/file_localhost_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_localhost_inner.html^headers^
+++ b/netwerk/test/mochitests/file_localhost_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_loopback_inner.html^headers^ b/netwerk/test/mochitests/file_loopback_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_loopback_inner.html^headers^
+++ b/netwerk/test/mochitests/file_loopback_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/file_subdomain_inner.html^headers^ b/netwerk/test/mochitests/file_subdomain_inner.html^headers^
index 993cedb90836..a56be562a47f 100644
--- a/netwerk/test/mochitests/file_subdomain_inner.html^headers^
+++ b/netwerk/test/mochitests/file_subdomain_inner.html^headers^
@@ -1 +1,4 @@
 Set-Cookie: meta=tag
+Cache-Control: no-cache, no-store, must-revalidate
+Pragma: no-cache
+Expires: 0
diff --git a/netwerk/test/mochitests/test_same_base_domain.html b/netwerk/test/mochitests/test_same_base_domain.html
index 996f54fe1849..45d64d42efe6 100644
--- a/netwerk/test/mochitests/test_same_base_domain.html
+++ b/netwerk/test/mochitests/test_same_base_domain.html
@@ -5,7 +5,7 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://test1.example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 4, 2)">
+<body onload="setupTest('http://test1.example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
diff --git a/netwerk/test/mochitests/test_same_base_domain_3.html b/netwerk/test/mochitests/test_same_base_domain_3.html
index 1bf7fb329570..1b5b7227e5d7 100644
--- a/netwerk/test/mochitests/test_same_base_domain_3.html
+++ b/netwerk/test/mochitests/test_same_base_domain_3.html
@@ -5,7 +5,7 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 4, 2)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
diff --git a/netwerk/test/mochitests/test_same_base_domain_5.html b/netwerk/test/mochitests/test_same_base_domain_5.html
index 7ce91a7277b0..ecfd56ea5ab0 100644
--- a/netwerk/test/mochitests/test_same_base_domain_5.html
+++ b/netwerk/test/mochitests/test_same_base_domain_5.html
@@ -5,7 +5,7 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://sub1.test1.example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 4, 2)">
+<body onload="setupTest('http://sub1.test1.example.org/tests/netwerk/test/mochitests/file_subdomain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">
diff --git a/netwerk/test/mochitests/test_samedomain.html b/netwerk/test/mochitests/test_samedomain.html
index 6d03225e3e24..c05a02febd4a 100644
--- a/netwerk/test/mochitests/test_samedomain.html
+++ b/netwerk/test/mochitests/test_samedomain.html
@@ -5,7 +5,7 @@
   <script src="/tests/SimpleTest/SimpleTest.js"></script>        
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
-<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 4, 2)">
+<body onload="setupTest('http://example.org/tests/netwerk/test/mochitests/file_domain_inner.html', 5, 2)">
 <p id="display"></p>
 <pre id="test">
 <script class="testbody" type="text/javascript" src="file_testcommon.js">