From 415e3e6e03f81591a75ace75c80ac35dde350bd0 Mon Sep 17 00:00:00 2001 From: Masatoshi Kimura Date: Wed, 30 Nov 2016 19:33:46 +0900 Subject: [PATCH] Bug 1321252 - Stop setting "network.http.spdy.enforce-tls-profile" in tests. r=nwgh MozReview-Commit-ID: 6qbgQxG32Kj --HG-- extra : rebase_source : 7059b80aabaeff03bfb2608dd757c4401fdda0e7 --- dom/push/test/xpcshell/test_notification_http2.js | 8 -------- dom/push/test/xpcshell/test_register_error_http2.js | 8 -------- dom/push/test/xpcshell/test_register_success_http2.js | 4 ---- dom/push/test/xpcshell/test_unregister_success_http2.js | 4 ---- netwerk/test/unit/test_altsvc.js | 4 ---- netwerk/test/unit/test_http2.js | 4 ---- netwerk/test/unit/test_immutable.js | 4 ---- 7 files changed, 36 deletions(-) diff --git a/dom/push/test/xpcshell/test_notification_http2.js b/dom/push/test/xpcshell/test_notification_http2.js index 1b334bfba50e..aa70ca503d7f 100644 --- a/dom/push/test/xpcshell/test_notification_http2.js +++ b/dom/push/test/xpcshell/test_notification_http2.js @@ -8,7 +8,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const {PushDB, PushService, PushServiceHttp2} = serviceExports; var prefs; -var tlsProfile; var serverPort = -1; @@ -21,12 +20,9 @@ function run_test() { }); prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); - tlsProfile = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); - // Set to allow the cert presented by our H2 server var oldPref = prefs.getIntPref("network.http.speculative-parallel-limit"); prefs.setIntPref("network.http.speculative-parallel-limit", 0); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setBoolPref("dom.push.enabled", true); prefs.setBoolPref("dom.push.connection.enabled", true); @@ -183,7 +179,3 @@ add_task(function* test_pushNotifications() { yield notifyPromise; }); - -add_task(function* test_complete() { - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlsProfile); -}); diff --git a/dom/push/test/xpcshell/test_register_error_http2.js b/dom/push/test/xpcshell/test_register_error_http2.js index eeb3b64b091d..d22852969423 100644 --- a/dom/push/test/xpcshell/test_register_error_http2.js +++ b/dom/push/test/xpcshell/test_register_error_http2.js @@ -8,7 +8,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const {PushDB, PushService, PushServiceHttp2} = serviceExports; var prefs; -var tlsProfile; var serverURL; var serverPort = -1; @@ -19,8 +18,6 @@ function run_test() { do_get_profile(); prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); - tlsProfile = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); - serverURL = "https://localhost:" + serverPort; run_next_test(); @@ -57,7 +54,6 @@ add_task(function* test_TLS() { // Set to allow the cert presented by our H2 server var oldPref = prefs.getIntPref("network.http.speculative-parallel-limit"); prefs.setIntPref("network.http.speculative-parallel-limit", 0); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); addCertOverride("localhost", serverPort, Ci.nsICertOverrideService.ERROR_UNTRUSTED | @@ -195,7 +191,3 @@ add_task(function* test_pushSubscriptionNot2xxCode() { let record = yield db.getAllKeyIDs(); ok(record.length === 0, 'Should not store records when respons code is not 201.'); }); - -add_task(function* test_complete() { - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlsProfile); -}); diff --git a/dom/push/test/xpcshell/test_register_success_http2.js b/dom/push/test/xpcshell/test_register_success_http2.js index b4dbb09e375c..500aeb383103 100644 --- a/dom/push/test/xpcshell/test_register_success_http2.js +++ b/dom/push/test/xpcshell/test_register_success_http2.js @@ -8,7 +8,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const {PushDB, PushService, PushServiceHttp2} = serviceExports; var prefs; -var tlsProfile; var serverURL; var serverPort = -1; var pushEnabled; @@ -21,14 +20,12 @@ function run_test() { do_get_profile(); prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); - tlsProfile = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); pushEnabled = prefs.getBoolPref("dom.push.enabled"); pushConnectionEnabled = prefs.getBoolPref("dom.push.connection.enabled"); // Set to allow the cert presented by our H2 server var oldPref = prefs.getIntPref("network.http.speculative-parallel-limit"); prefs.setIntPref("network.http.speculative-parallel-limit", 0); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setBoolPref("dom.push.enabled", true); prefs.setBoolPref("dom.push.connection.enabled", true); @@ -122,7 +119,6 @@ add_task(function* test_pushSubscriptionMissingLink2() { }); add_task(function* test_complete() { - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlsProfile); prefs.setBoolPref("dom.push.enabled", pushEnabled); prefs.setBoolPref("dom.push.connection.enabled", pushConnectionEnabled); }); diff --git a/dom/push/test/xpcshell/test_unregister_success_http2.js b/dom/push/test/xpcshell/test_unregister_success_http2.js index f2eb3533181a..4b8c5af3a7e8 100644 --- a/dom/push/test/xpcshell/test_unregister_success_http2.js +++ b/dom/push/test/xpcshell/test_unregister_success_http2.js @@ -8,7 +8,6 @@ Cu.import("resource://gre/modules/Services.jsm"); const {PushDB, PushService, PushServiceHttp2} = serviceExports; var prefs; -var tlsProfile; var pushEnabled; var pushConnectionEnabled; @@ -20,14 +19,12 @@ function run_test() { do_get_profile(); prefs = Cc["@mozilla.org/preferences-service;1"].getService(Ci.nsIPrefBranch); - tlsProfile = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); pushEnabled = prefs.getBoolPref("dom.push.enabled"); pushConnectionEnabled = prefs.getBoolPref("dom.push.connection.enabled"); // Set to allow the cert presented by our H2 server var oldPref = prefs.getIntPref("network.http.speculative-parallel-limit"); prefs.setIntPref("network.http.speculative-parallel-limit", 0); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setBoolPref("dom.push.enabled", true); prefs.setBoolPref("dom.push.connection.enabled", true); @@ -75,7 +72,6 @@ add_task(function* test_pushUnsubscriptionSuccess() { }); add_task(function* test_complete() { - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlsProfile); prefs.setBoolPref("dom.push.enabled", pushEnabled); prefs.setBoolPref("dom.push.connection.enabled", pushConnectionEnabled); }); diff --git a/netwerk/test/unit/test_altsvc.js b/netwerk/test/unit/test_altsvc.js index 7dafca0285bb..c33995581cc7 100644 --- a/netwerk/test/unit/test_altsvc.js +++ b/netwerk/test/unit/test_altsvc.js @@ -5,7 +5,6 @@ var h2Port; var prefs; var spdypref; var http2pref; -var tlspref; var altsvcpref1; var altsvcpref2; @@ -34,13 +33,11 @@ function run_test() { spdypref = prefs.getBoolPref("network.http.spdy.enabled"); http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2"); - tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); altsvcpref1 = prefs.getBoolPref("network.http.altsvc.enabled"); altsvcpref2 = prefs.getBoolPref("network.http.altsvc.oe", true); prefs.setBoolPref("network.http.spdy.enabled", true); prefs.setBoolPref("network.http.spdy.enabled.http2", true); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setBoolPref("network.http.altsvc.enabled", true); prefs.setBoolPref("network.http.altsvc.oe", true); prefs.setCharPref("network.dns.localDomains", "foo.example.com, bar.example.com"); @@ -114,7 +111,6 @@ function h1ServerWK(metadata, response) { function resetPrefs() { prefs.setBoolPref("network.http.spdy.enabled", spdypref); prefs.setBoolPref("network.http.spdy.enabled.http2", http2pref); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlspref); prefs.setBoolPref("network.http.altsvc.enabled", altsvcpref1); prefs.setBoolPref("network.http.altsvc.oe", altsvcpref2); prefs.clearUserPref("network.dns.localDomains"); diff --git a/netwerk/test/unit/test_http2.js b/netwerk/test/unit/test_http2.js index 3fefe707e78e..16dbc5a0faa3 100644 --- a/netwerk/test/unit/test_http2.js +++ b/netwerk/test/unit/test_http2.js @@ -1025,7 +1025,6 @@ var prefs; var spdypref; var spdypush; var http2pref; -var tlspref; var altsvcpref1; var altsvcpref2; var loadGroup; @@ -1037,7 +1036,6 @@ function resetPrefs() { prefs.setBoolPref("network.http.spdy.enabled", spdypref); prefs.setBoolPref("network.http.spdy.allow-push", spdypush); prefs.setBoolPref("network.http.spdy.enabled.http2", http2pref); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlspref); prefs.setBoolPref("network.http.altsvc.enabled", altsvcpref1); prefs.setBoolPref("network.http.altsvc.oe", altsvcpref2); prefs.clearUserPref("network.dns.localDomains"); @@ -1072,7 +1070,6 @@ function run_test() { spdypref = prefs.getBoolPref("network.http.spdy.enabled"); spdypush = prefs.getBoolPref("network.http.spdy.allow-push"); http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2"); - tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); altsvcpref1 = prefs.getBoolPref("network.http.altsvc.enabled"); altsvcpref2 = prefs.getBoolPref("network.http.altsvc.oe", true); @@ -1080,7 +1077,6 @@ function run_test() { prefs.setBoolPref("network.http.spdy.enabled.v3-1", true); prefs.setBoolPref("network.http.spdy.allow-push", true); prefs.setBoolPref("network.http.spdy.enabled.http2", true); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setBoolPref("network.http.altsvc.enabled", true); prefs.setBoolPref("network.http.altsvc.oe", true); prefs.setCharPref("network.dns.localDomains", "foo.example.com, bar.example.com"); diff --git a/netwerk/test/unit/test_immutable.js b/netwerk/test/unit/test_immutable.js index d3438bbe1123..6e70be312115 100644 --- a/netwerk/test/unit/test_immutable.js +++ b/netwerk/test/unit/test_immutable.js @@ -4,7 +4,6 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); var prefs; var spdypref; var http2pref; -var tlspref; var origin; function run_test() { @@ -19,11 +18,9 @@ function run_test() { spdypref = prefs.getBoolPref("network.http.spdy.enabled"); http2pref = prefs.getBoolPref("network.http.spdy.enabled.http2"); - tlspref = prefs.getBoolPref("network.http.spdy.enforce-tls-profile"); prefs.setBoolPref("network.http.spdy.enabled", true); prefs.setBoolPref("network.http.spdy.enabled.http2", true); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", false); prefs.setCharPref("network.dns.localDomains", "foo.example.com, bar.example.com"); // The moz-http2 cert is for foo.example.com and is signed by CA.cert.der @@ -40,7 +37,6 @@ function run_test() { function resetPrefs() { prefs.setBoolPref("network.http.spdy.enabled", spdypref); prefs.setBoolPref("network.http.spdy.enabled.http2", http2pref); - prefs.setBoolPref("network.http.spdy.enforce-tls-profile", tlspref); prefs.clearUserPref("network.dns.localDomains"); }