summaryrefslogtreecommitdiffstats
path: root/tests/auto/network
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-05-31 16:37:44 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-01 03:16:11 +0200
commit9469e9fdebff5cb280da800908991ec580a000f6 (patch)
tree99382317f8b08fe0e21eecca47b3d79f3421af87 /tests/auto/network
parent55d0c6c6cf2c1244a7a42db5d97753640d02598c (diff)
Make tst_qabstractnetworkcache parallel-safe
Use a unique QTemporaryDir instead of a fixed path for the test cache. Change-Id: Ib664033a509a6cefd7c323708f80ef595b202178 Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Diffstat (limited to 'tests/auto/network')
-rw-r--r--tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro1
-rw-r--r--tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp7
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
index 69062bc0c9..777f84ce2b 100644
--- a/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
+++ b/tests/auto/network/access/qabstractnetworkcache/qabstractnetworkcache.pro
@@ -1,4 +1,5 @@
CONFIG += testcase
+CONFIG += parallel_test
TARGET = tst_qabstractnetworkcache
QT += network testlib
QT -= gui
diff --git a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
index 788abc349a..979032ca1d 100644
--- a/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
+++ b/tests/auto/network/access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp
@@ -39,7 +39,7 @@
**
****************************************************************************/
-
+#include <QTemporaryDir>
#include <QtTest/QtTest>
#include <QtNetwork/QtNetwork>
#include "../../../network-settings.h"
@@ -101,10 +101,10 @@ class NetworkDiskCache : public QNetworkDiskCache
public:
NetworkDiskCache(QObject *parent = 0)
: QNetworkDiskCache(parent)
+ , tempDir(QDir::tempPath() + QLatin1String("/tst_qabstractnetworkcache.XXXXXX"))
, gotData(false)
{
- QString location = QDir::tempPath() + QLatin1String("/tst_qnetworkdiskcache/");
- setCacheDirectory(location);
+ setCacheDirectory(tempDir.path());
clear();
}
@@ -114,6 +114,7 @@ public:
return QNetworkDiskCache::data(url);
}
+ QTemporaryDir tempDir;
bool gotData;
};