Improve handling of temporary directories in SQL tests.

Initialize directory delayed in shared code and add checks to verify
that it is valid. Close attached / cloned databases to prevent locks
on files and leaking temporary directories caused by SQLite:

QTemporaryDir: Unable to remove "...\Temp\tst_qsqldatabase-P1XkOA" most likely due to the presence of read-only files.
QTemporaryDir: Unable to remove "...\Temp\tst_qsqltablemodel-P1XkOA" most likely due to the presence of read-only files.
QWARN  : tst_QSql::concurrentAccess() QTemporaryDir: Unable to remove "...\Temp\tst_qsql-l0VAKJ" most likely due to the presence of read-only files.

Change-Id: If85bbaed04bb1a32e427d642be332996d967f796
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

2 files changed, 31 insertions, 8 deletions

diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
index 5c8b3ef728..db01135230 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_databases.h
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -49,6 +49,7 @@
 #include <QSqlQuery>
 #include <QRegExp>
 #include <QDir>
+#include <QScopedPointer>
 #include <QVariant>
 #include <QDebug>
 #include <QSqlTableModel>
@@ -248,7 +249,7 @@ public:
         dbNames.append( cName );
     }
 
-    void addDbs()
+    bool addDbs()
     {
         //addDb("QOCI", "localhost", "system", "penandy");
 //         addDb( "QOCI8", "//horsehead.qt-project.org:1521/pony.troll.no", "scott", "tiger" ); // Oracle 9i on horsehead
@@ -302,7 +303,10 @@ public:
 
 //      use in-memory database to prevent local files
 //         addDb("QSQLITE", ":memory:");
-         addDb( "QSQLITE", QDir::toNativeSeparators(dbDir.path() + "/foo.db") );
+        QTemporaryDir *sqLiteDir = dbDir();
+        if (!sqLiteDir)
+            return false;
+        addDb( QStringLiteral("QSQLITE"), QDir::toNativeSeparators(sqLiteDir->path() + QStringLiteral("/foo.db")) );
 //         addDb( "QSQLITE2", QDir::toNativeSeparators(dbDir.path() + "/foo2.db") );
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=iceblink.qt-project.org\\ICEBLINK", "troll", "trond", "" );
 //         addDb( "QODBC3", "DRIVER={SQL Native Client};SERVER=silence.qt-project.org\\SQLEXPRESS", "troll", "trond", "" );
@@ -319,11 +323,14 @@ public:
 //         addDb( "QODBC3", "DRIVER={SQL SERVER};SERVER=bq-winserv2008-x86-01.qt-project.org;DATABASE=testdb;PORT=1433", "testuser", "Ee4Gabf6_", "" );
 //         addDb( "QODBC", "DRIVER={Microsoft Access Driver (*.mdb)};DBQ=c:\\dbs\\access\\testdb.mdb", "", "", "" );
 //         addDb( "QODBC", "DRIVER={Postgresql};SERVER=bq-pgsql84.qt-project.org;DATABASE=testdb", "testuser", "Ee4Gabf6_", "" );
+         return true;
     }
 
-    void open()
+    // 'false' return indicates a system error, for example failure to create a temporary directory.
+    bool open()
     {
-        addDbs();
+        if (!addDbs())
+            return false;
 
         QStringList::Iterator it = dbNames.begin();
 
@@ -341,6 +348,7 @@ public:
                 }
             }
         }
+        return true;
     }
 
     void close()
@@ -589,7 +597,21 @@ public:
 
     QStringList     dbNames;
     int      counter;
-    QTemporaryDir dbDir;
+
+private:
+    QTemporaryDir *dbDir()
+    {
+        if (m_dbDir.isNull()) {
+            m_dbDir.reset(new QTemporaryDir);
+            if (!m_dbDir->isValid()) {
+                qWarning() << Q_FUNC_INFO << "Unable to create a temporary directory: " << QDir::toNativeSeparators(m_dbDir->path());
+                m_dbDir.reset();
+            }
+        }
+        return m_dbDir.data();
+    }
+
+    QScopedPointer<QTemporaryDir> m_dbDir;
 };
 
 #endif
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
index 6e199d5a71..fa5db999d4 100644
--- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
+++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp
@@ -1,6 +1,6 @@
 /****************************************************************************
 **
-** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
 ** Contact: http://www.qt-project.org/legal
 **
 ** This file is part of the test suite of the Qt Toolkit.
@@ -394,7 +394,7 @@ void tst_QSqlDatabase::populateTestTables(QSqlDatabase db)
 void tst_QSqlDatabase::initTestCase()
 {
     qRegisterMetaType<QSqlDriver::NotificationSource>("QSqlDriver::NotificationSource");
-    dbs.open();
+    QVERIFY(dbs.open());
 
     for (QStringList::ConstIterator it = dbs.dbNames.begin(); it != dbs.dbNames.end(); ++it) {
         QSqlDatabase db = QSqlDatabase::database((*it));
@@ -2229,6 +2229,7 @@ void tst_QSqlDatabase::sqlite_enable_cache_mode()
     QSqlQuery q(db), q2(db2);
     QVERIFY_SQL(q, exec("select * from " + qTableName("qtest", __FILE__, db)));
     QVERIFY_SQL(q2, exec("select * from " + qTableName("qtest", __FILE__, db)));
+    db2.close();
 }
 
 QTEST_MAIN(tst_QSqlDatabase)