commit 8592446c194092c93c854611fc7dadd1fd3f3917 Author: Georg Koppen gk@torproject.org Date: Wed Apr 18 07:31:48 2018 +0000

Bug 25331: Fix failing test from #18192

This patch was written by mcs and brade --- .../tests/chrome/test_0790_check_certPinning_noUpdate.xul | 10 ++++++++++ 1 file changed, 10 insertions(+)

diff --git a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul index f5a97cf204ac..fcb571a4ddc6 100644 --- a/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul +++ b/toolkit/mozapps/update/tests/chrome/test_0790_check_certPinning_noUpdate.xul @@ -27,9 +27,13 @@ const TESTS = [ { buttonClick: "finish" } ];

+const kCertPinningEnforcementLevelPref = "security.cert_pinning.enforcement_level"; + function runTest() { debugDump("entering");

+ SpecialPowers.setIntPref(kCertPinningEnforcementLevelPref, 2); // strict + // Set the update URL. // https://badchain.include-subdomains.pinning.example.com is preconfigured // by the test framework for use in key pinning tests. @@ -43,6 +47,12 @@ function runTest() { gUP.checkForUpdates(); }

+function finishTest() +{ + SpecialPowers.clearUserPref(kCertPinningEnforcementLevelPref); + finishTestDefault(); +} + function checkErrorCode() { // From security/manager/ssl/tests/unit/head_psm.js: const MOZILLA_PKIX_ERROR_BASE = Ci.nsINSSErrorsService.MOZILLA_PKIX_ERROR_BASE;