summaryrefslogtreecommitdiffstats
path: root/tests/auto/sql/kernel/qsqlthread
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2011-10-19 12:53:13 +1000
committerQt by Nokia <qt-info@nokia.com>2011-10-21 01:20:29 +0200
commit27f9f136f7e39b5d612bc02f7ff8778ab424c07d (patch)
tree3c72358e3d1e42fbf0c386365e76db259e180bd7 /tests/auto/sql/kernel/qsqlthread
parent016cd01846539404a0eff1e3823fa2206fe2c9a9 (diff)
Remove SkipMode parameter from QSKIP calls.
The previous commit removed SkipMode from the testlib APi. This commit removes the parameter from all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I21c0ee6731c1bc6ac6d962590d9b31d7459dfbc5 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Diffstat (limited to 'tests/auto/sql/kernel/qsqlthread')
-rw-r--r--tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
index 79ebc93a80..f14b3d4e93 100644
--- a/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
+++ b/tests/auto/sql/kernel/qsqlthread/tst_qsqlthread.cpp
@@ -291,9 +291,9 @@ void tst_QSqlThread::generic_data(const QString& engine)
{
if ( dbs.fillTestTable(engine) == 0 ) {
if(engine.isEmpty())
- QSKIP( "No database drivers are available in this Qt configuration", SkipAll );
+ QSKIP( "No database drivers are available in this Qt configuration");
else
- QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit(), SkipAll );
+ QSKIP( (QString("No database drivers of type %1 are available in this Qt configuration").arg(engine)).toLocal8Bit());
}
}
@@ -380,7 +380,7 @@ void tst_QSqlThread::simpleThreading()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
QtTestSqlThread t1(db);
QtTestSqlThread t2(db);
@@ -404,9 +404,9 @@ void tst_QSqlThread::readWriteThreading()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
else if (tst_Databases::isMSAccess(db))
- QSKIP("does not work with MS Access databases", SkipSingle);
+ QSKIP("does not work with MS Access databases");
SqlProducer producer(db);
SqlConsumer consumer(db);
@@ -432,7 +432,7 @@ void tst_QSqlThread::readFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
QObject cleanupHelper; // make sure the threads die when we exit the scope
for (int i = 0; i < maxThreadCount; ++i) {
@@ -454,7 +454,7 @@ void tst_QSqlThread::readWriteFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
QObject cleanupHelper;
for (int i = 0; i < maxThreadCount; ++i) {
@@ -480,7 +480,7 @@ void tst_QSqlThread::preparedReadWriteFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
QObject cleanupHelper;
for (int i = 0; i < maxThreadCount; ++i) {
@@ -506,7 +506,7 @@ void tst_QSqlThread::transactionsFromSingleConnection()
CHECK_DATABASE(db);
if (db.databaseName() == ":memory:")
- QSKIP("does not work with in-memory databases", SkipSingle);
+ QSKIP("does not work with in-memory databases");
// start and commit a transaction
QVERIFY_SQL(db, db.transaction());