From 818a133d91981bec2fcf1bedff7ae596fa915ac1 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Wed, 31 May 2023 14:08:50 +0200 Subject: tests: Make sure QNetworkDiskCacheMetadata has a header set Qt 6.5.1 started treating the absence of a header as the cache entry being corrupted... https://bugreports.qt.io/browse/QTBUG-111397 https://codereview.qt-project.org/c/qt/qtbase/+/465547 --- tests/unit/browser/webkit/test_cache.py | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/unit/browser/webkit/test_cache.py b/tests/unit/browser/webkit/test_cache.py index 90715ec21..8e43b583f 100644 --- a/tests/unit/browser/webkit/test_cache.py +++ b/tests/unit/browser/webkit/test_cache.py @@ -30,10 +30,19 @@ def disk_cache(tmpdir, config_stub): return cache.DiskCache(str(tmpdir)) -def preload_cache(cache, url='http://www.example.com/', content=b'foobar'): +def build_metadata(url='http://qutebrowser.org/'): metadata = QNetworkCacheMetaData() metadata.setUrl(QUrl(url)) + # https://codereview.qt-project.org/c/qt/qtbase/+/465547 + metadata.setRawHeaders([(b"X-Hello", b"World")]) + assert metadata.isValid() + assert metadata.rawHeaders() + return metadata + + +def preload_cache(cache, url='http://www.example.com/', content=b'foobar'): + metadata = build_metadata(url) device = cache.prepare(metadata) assert device is not None device.write(content) @@ -71,12 +80,8 @@ def test_cache_size_leq_max_cache_size(config_stub, tmpdir): def test_cache_existing_metadata_file(tmpdir, disk_cache): """Test querying existing meta data file from activated cache.""" - url = 'http://qutebrowser.org' content = b'foobar' - - metadata = QNetworkCacheMetaData() - metadata.setUrl(QUrl(url)) - assert metadata.isValid() + metadata = build_metadata() device = disk_cache.prepare(metadata) assert device is not None @@ -173,8 +178,7 @@ def test_cache_full(tmpdir): content2 = b'ohmycert' preload_cache(disk_cache, url2, content2) - metadata = QNetworkCacheMetaData() - metadata.setUrl(QUrl(url)) + metadata = build_metadata(url) soon = QDateTime.currentDateTime().addMonths(4) assert soon.isValid() metadata.setLastModified(soon) -- cgit v1.2.3-54-g00ecf