Make tst_qnetworkreply parallel-safe.

Ensure we always use a unique filename when writing to test files.
The test already contained code for this, but it was not applied in a
couple of places.

Change-Id: I1e29ee162c390e014688ab46e3658e2a463d203e
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>

diff --git a/tests/auto/network/access/qnetworkreply/test/test.pro b/tests/auto/network/access/qnetworkreply/test/test.pro
index faa584c..61f979d 100644 (file)
--- a/tests/auto/network/access/qnetworkreply/test/test.pro
+++ b/tests/auto/network/access/qnetworkreply/test/test.pro
@@ -1,4 +1,5 @@
 CONFIG += testcase
+CONFIG += parallel_test
 QT -= gui
 SOURCES  += ../tst_qnetworkreply.cpp
 TARGET = ../tst_qnetworkreply

diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 2c02df0..bc2a95d 100644 (file)
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -1125,8 +1125,8 @@ tst_QNetworkReply::tst_QNetworkReply()
 #endif
     qRegisterMetaType<QNetworkReply::NetworkError>();
 
-    testFileName = QDir::currentPath() + "/testfile";
     uniqueExtension = createUniqueExtension();
+    testFileName = QDir::currentPath() + "/testfile" + uniqueExtension;
     cookieJar = new MyCookieJar;
     manager.setCookieJar(cookieJar);
 
@@ -1351,7 +1351,7 @@ void tst_QNetworkReply::initTestCase()
 
     QVERIFY(QtNetworkSettings::verifyTestNetworkSettings());
 #if !defined Q_OS_WIN
-    wronlyFileName = testDataDir + "/write-only";
+    wronlyFileName = testDataDir + "/write-only" + uniqueExtension;
     QFile wr(wronlyFileName);
     QVERIFY(wr.open(QIODevice::WriteOnly | QIODevice::Truncate));
     wr.setPermissions(QFile::WriteOwner | QFile::WriteUser);