commit 8b3064548eb10178858bb8b4df7b86a2041e0692 parent d7a5e533b313308f47a0244975a0b426b2a9fdaa Author: Randell Jesup <rjesup@mozilla.com> Date: Mon, 3 Nov 2025 18:26:15 +0000 Bug 1993556: Disable cache purging during web-platform compression dictionary tests r=necko-reviewers,valentin,sunil Differential Revision: https://phabricator.services.mozilla.com/D268191 Diffstat:
7 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/modules/libpref/init/StaticPrefList.yaml b/modules/libpref/init/StaticPrefList.yaml @@ -15550,6 +15550,12 @@ value: false mirror: always +# Disable cache purging temporarily to support cache tests +- name: network.cache.purge_disable + type: RelaxedAtomicBool + value: false + mirror: always + # The number of milliseconds after which a suspended channel writing # to a cache entry will notify all readers waiting for a callback to # continue without a cache entry. diff --git a/netwerk/cache2/CacheStorageService.cpp b/netwerk/cache2/CacheStorageService.cpp @@ -1378,6 +1378,9 @@ void CacheStorageService::PurgeExpiredOrOverMemoryLimit() { } void CacheStorageService::MemoryPool::PurgeExpiredOrOverMemoryLimit() { + if (StaticPrefs::network_cache_purge_disable()) { + return; + } TimeStamp start(TimeStamp::Now()); uint32_t const memoryLimit = Limit(); diff --git a/testing/web-platform/meta/fetch/compression-dictionary/__dir__.ini b/testing/web-platform/meta/fetch/compression-dictionary/__dir__.ini @@ -0,0 +1 @@ +prefs: [network.cache.purge_disable:true] diff --git a/testing/web-platform/meta/fetch/compression-dictionary/dictionary-compressed.tentative.https.html.ini b/testing/web-platform/meta/fetch/compression-dictionary/dictionary-compressed.tentative.https.html.ini @@ -1,5 +0,0 @@ -[dictionary-compressed.tentative.https.html] - [A dcz dictionary-compressed dictionary can be used as a dictionary for future requests.] - expected: - if (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL] - if (os == "win") and not debug and (processor == "x86"): [PASS, FAIL] diff --git a/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-no-cors.tentative.https.html.ini b/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-no-cors.tentative.https.html.ini diff --git a/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-element.tentative.https.html.ini b/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-element.tentative.https.html.ini @@ -1,12 +0,0 @@ -[Fetch same origin dictionary using link header] - expected: - if os == "android": [OK, ERROR] - -[Fetch cross origin dictionary using link element] - expected: - if os == "android": [OK, ERROR] - -[dictionary-fetch-with-link-element.tentative.https.html] - [Fetch same origin dictionary using link element] - expected: - if (os == "win") and not debug and (processor == "x86_64"): [PASS, FAIL] diff --git a/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-header.tentative.https.html.ini b/testing/web-platform/meta/fetch/compression-dictionary/dictionary-fetch-with-link-header.tentative.https.html.ini @@ -1,6 +0,0 @@ -[dictionary-fetch-with-link-header.tentative.https.html] - [Fetch same origin dictionary using link header] - expected: - if (os == "linux") and asan and fission: [PASS, FAIL] - if (os == "android") and not debug and sessionHistoryInParent: [PASS, FAIL] - if (os == "android") and not debug and not sessionHistoryInParent: [PASS, FAIL]