1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tst_QNetworkReply: Commentary fixes on test server workarounds.

Browse Source 
Follow-up to commit 6fd205d5: document which version of danted shall
make one work-around redundant, document that another work-around is
still needed even with that v1.1.19; and remove a comment that
referred back to an XFAIL that commit 6fd205d5 removed.

Change-Id: I270b662528127c82184bff20b3cecea4f0c41b41
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@theqtcompany.com>
This commit is contained in:
Edward Welbourne 2016-03-15 17:00:29 +01:00
parent 949aaffb4f
commit 541c9d4d2a
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
View File

@ -6814,19 +6814,19 @@ void tst_QNetworkReply::authenticationCacheAfterCancel()
QTestEventLoop::instance().enterLoop(10); QTestEventLoop::instance().enterLoop(10);
QVERIFY(!QTestEventLoop::instance().timeout()); QVERIFY(!QTestEventLoop::instance().timeout());
// Work round known quirk in the old test server: // Work round known quirk in the old test server (danted -v < v1.1.19):
if (reply->error() != QNetworkReply::HostNotFoundError) if (reply->error() != QNetworkReply::HostNotFoundError)
QCOMPARE(reply->error(), QNetworkReply::ProxyAuthenticationRequiredError); QCOMPARE(reply->error(), QNetworkReply::ProxyAuthenticationRequiredError);
QCOMPARE(authSpy.count(), 0); QCOMPARE(authSpy.count(), 0);
QVERIFY(proxyAuthSpy.count() > 0); QVERIFY(proxyAuthSpy.count() > 0);
proxyAuthSpy.clear(); proxyAuthSpy.clear();
//QTBUG-23136 workaround // QTBUG-23136 workaround (needed even with danted v1.1.19):
if (proxy.port() == 1081) { if (proxy.port() == 1081) {
#ifdef QT_BUILD_INTERNAL #ifdef QT_BUILD_INTERNAL
QNetworkAccessManagerPrivate::clearCache(&manager); QNetworkAccessManagerPrivate::clearCache(&manager);
#else #else
return; //XFAIL result above return;
#endif #endif
} }