From 9469e9fdebff5cb280da800908991ec580a000f6 Mon Sep 17 00:00:00 2001
From: Rohan McGovern <rohan.mcgovern@nokia.com>
Date: Thu, 31 May 2012 16:37:44 +1000
Subject: 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>
---
 .../network/access/qabstractnetworkcache/qabstractnetworkcache.pro | 1 +
 .../access/qabstractnetworkcache/tst_qabstractnetworkcache.cpp     | 7 ++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'tests/auto/network/access')

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;
 };
 
-- 
cgit v1.2.3