Backed out changeset c844ec70bdb4 (bug 1342178) for frequently timing out in test_network_security.html on Linux. r=backout a=backout
authorSebastian Hengst <archaeopteryx@coole-files.de>
Tue, 11 Apr 2017 11:28:59 +0200
changeset 352361 f914d40a48009c5acd1093e9939cc0ec035696dd
parent 352360 3d3e5d0a650bed912cadecc228d89976d826f86f
child 352362 c8a3c022f7a0c589c9a557b015a6653fd3b7dce2
child 352468 562fe4b90a3535940da031ca646116bf3fc808f8
child 352476 1a883c596848498bd97d4f3a48679fe4f2b4484a
child 352931 a0dd5dc6fe2846e64de9feb1035b7618ca5adb6a
push id40476
push userarchaeopteryx@coole-files.de
push dateTue, 11 Apr 2017 09:33:49 +0000
treeherderautoland@c8a3c022f7a0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout, backout
bugs1342178
milestone55.0a1
backs outc844ec70bdb4fda4816dce395e6f489ef9480829
first release with
nightly linux32
f914d40a4800 / 55.0a1 / 20170411100202 / files
nightly linux64
f914d40a4800 / 55.0a1 / 20170411100202 / files
nightly mac
f914d40a4800 / 55.0a1 / 20170411030208 / files
nightly win32
f914d40a4800 / 55.0a1 / 20170411030208 / files
nightly win64
f914d40a4800 / 55.0a1 / 20170411030208 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Backed out changeset c844ec70bdb4 (bug 1342178) for frequently timing out in test_network_security.html on Linux. r=backout a=backout MozReview-Commit-ID: 3NVZcUPRc2c
devtools/shared/webconsole/test/test_network_security-hpkp.html
--- a/devtools/shared/webconsole/test/test_network_security-hpkp.html
+++ b/devtools/shared/webconsole/test/test_network_security-hpkp.html
@@ -17,51 +17,29 @@
 SimpleTest.waitForExplicitFinish();
 
 let gCurrentTestCase = -1;
 const HPKP_PREF = "security.cert_pinning.process_headers_from_non_builtin_roots";
 
 // Static pins tested by unit/test_security-info-static-hpkp.js.
 const TEST_CASES = [
   {
-    desc: "no HSTS or HPKP",
+    desc: "no Public Key Pinning",
     url: "https://example.com",
-    usesHSTS: false,
-    usesPinning: false,
-  },
-  {
-    desc: "HSTS from this response, no Public Key Pinning",
-    url: "https://example.com/" +
-         "browser/browser/base/content/test/general/browser_star_hsts.sjs",
-    usesHSTS: true,
     usesPinning: false,
   },
   {
-    desc: "stored HSTS from previous response, no Public Key Pinning",
-    url: "https://example.com/",
-    usesHSTS: true,
-    usesPinning: false,
-  },
-  {
-    desc: "no Public Key Pinning or HSTS",
-    url: "https://include-subdomains.pinning-dynamic.example.com/",
-    usesHSTS: false,
-    usesPinning: false,
-  },
-  {
-    desc: "dynamic Public Key Pinning with this request, no HSTS",
+    desc: "dynamic Public Key Pinning with this request",
     url: "https://include-subdomains.pinning-dynamic.example.com/" +
          "browser/browser/base/content/test/general/pinning_headers.sjs",
-    usesHSTS: false,
     usesPinning: true,
   },
   {
-    desc: "dynamic Public Key Pinning with previous request, no HSTS",
+    desc: "dynamic Public Key Pinning with previous request",
     url: "https://include-subdomains.pinning-dynamic.example.com/",
-    usesHSTS: false,
     usesPinning: true,
   }
 ];
 
 function startTest() {
   // Need to enable this pref or pinning headers are rejected due test
   // certificate.
   Services.prefs.setBoolPref(HPKP_PREF, true);
@@ -71,23 +49,21 @@ function startTest() {
     // Reset pinning state.
     let gSSService = Cc["@mozilla.org/ssservice;1"]
                        .getService(Ci.nsISiteSecurityService);
 
     let gIOService = Cc["@mozilla.org/network/io-service;1"]
                        .getService(Ci.nsIIOService);
     for (let {url} of TEST_CASES) {
       let uri = gIOService.newURI(url);
-      gSSService.removeState(Ci.nsISiteSecurityService.HEADER_HSTS, uri, 0);
       gSSService.removeState(Ci.nsISiteSecurityService.HEADER_HPKP, uri, 0);
     }
   });
 
-  info("Test detection of HTTP Strict Transport Security" +
-       " and Public Key Pinning.");
+  info("Test detection of Public Key Pinning.");
   removeEventListener("load", startTest);
   attachConsoleToTab(["NetworkActivity"], onAttach);
 }
 
 function onAttach(state, response) {
   onNetworkEventUpdate = onNetworkEventUpdate.bind(null, state);
   state.dbgClient.addListener("networkEventUpdate", onNetworkEventUpdate);
 
@@ -107,18 +83,16 @@ function runNextCase(state) {
 
   let iframe = document.querySelector("iframe").contentWindow;
   iframe.wrappedJSObject.makeXhrCallback("GET", url);
 }
 
 function onNetworkEventUpdate(state, type, packet) {
   function onSecurityInfo(received) {
     let data = TEST_CASES[gCurrentTestCase];
-    is(received.securityInfo.hsts, data.usesHSTS,
-      "Strict Transport Security detected correctly.");
     is(received.securityInfo.hpkp, data.usesPinning,
       "Public Key Pinning detected correctly.");
 
     runNextCase(state);
   }
 
   if (packet.updateType === "securityInfo") {
     state.client.getSecurityInfo(packet.from, onSecurityInfo);