summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
authorMårten Nordheim <marten.nordheim@qt.io>2020-08-24 15:57:08 +0200
committerMårten Nordheim <marten.nordheim@qt.io>2020-08-25 09:09:42 +0200
commit0871a7b5a282e1e665aafc61e00ff131a4adb540 (patch)
tree3ea7f88efd22b8c5d51d86507405a6e84f11f478 /tests/auto/network
parent862ac16ab16a7a7d5d299e8d71188b379d8f2baa (diff)
tst_QNetworkDiskCache: fix setCookieHeader
It wouldn't grab the cached entry since it was not deemed "fresh" (and would never be fresh because we didn't know when it originated from or when it expired). But the test still passed because the reply produced a "finished" signal which ended the loop, but the "finished" signal was due to an error which was unchecked. Change-Id: I6ad271aa621bdb4a48b74bc8fd64c7e2caa8f179 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
index 856033fb63..b724e3a40b 100644
--- a/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
+++ b/tests/auto/network/access/qnetworkdiskcache/tst_qnetworkdiskcache.cpp
@@ -402,12 +402,15 @@ void tst_QNetworkDiskCache::setCookieHeader() // QTBUG-41514
headers.append(QNetworkCacheMetaData::RawHeader("Set-Cookie", "aaa=bbb"));
metaData.setRawHeaders(headers);
metaData.setSaveToDisk(true);
+ QDateTime expirationDate = QDateTime::currentDateTime().addSecs(500);
+ metaData.setExpirationDate(expirationDate);
cache->setupWithOne(tempDir.path(), url, metaData);
manager = new QNetworkAccessManager();
manager->setCache(cache);
QNetworkRequest request(url);
+ request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
QNetworkReply *reply = manager->get(request);
connect(reply, SIGNAL(metaDataChanged()), this, SLOT(setCookieHeaderMetaDataChangedSlot()));
connect(reply, SIGNAL(finished()), &QTestEventLoop::instance(), SLOT(exitLoop()));
@@ -415,6 +418,8 @@ void tst_QNetworkDiskCache::setCookieHeader() // QTBUG-41514
QTestEventLoop::instance().enterLoop(5);
QVERIFY(!QTestEventLoop::instance().timeout());
+ QCOMPARE(reply->error(), QNetworkReply::NoError);
+
reply->deleteLater();
manager->deleteLater();
}