diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2025-04-09 09:54:40 -0700 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2025-04-18 23:23:15 +0000 |
| commit | d0787745aa43e5baf49de876f917946df6aceca5 (patch) | |
| tree | 702d73dc038cd535f19fcddea1d7fe81d7179df1 /tests | |
| parent | 9a6b7641e8214258ac2572305538180bf44eb321 (diff) | |
QSqlDatabase: make evident the name of the driver that failed to load6.8
Tell me this isn't confusing:
Got keys from plugin meta data ("QMYSQL3", "QMYSQL", "QMARIADB")
QSqlDatabase: driver not loaded
QSqlDatabase: available drivers: QSQLITE QMARIADB QMYSQL QMYSQL3
This also merges the two messages into a single line, which is nicer for
rich logging environments.
Change-Id: Ieb80c6571213dddc518bfffdb6c86632df8f932c
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 4216ba7c37dbdf67bfb5dc793d01a232ce4ea762)
(cherry picked from commit 22dd10e261c1c9ab46a8bfe99f574bae1c6c01e9)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp | 5 | ||||
| -rw-r--r-- | tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp index 79fe9d6333b..f4c180b2c1c 100644 --- a/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp +++ b/tests/auto/sql/kernel/qsqldatabase/tst_qsqldatabase.cpp @@ -383,8 +383,9 @@ void tst_QSqlDatabase::generic_data(const QString& engine) void tst_QSqlDatabase::addDatabase() { - QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: BLAH_FOO_NONEXISTENT_DRIVER driver not loaded"); - QTest::ignoreMessage(QtWarningMsg, qPrintable("QSqlDatabase: available drivers: " + QSqlDatabase::drivers().join(QLatin1Char(' ')))); + QTest::ignoreMessage(QtWarningMsg, + "QSqlDatabase: can not load requested driver 'BLAH_FOO_NONEXISTENT_DRIVER', available drivers: " + + QSqlDatabase::drivers().join(QLatin1Char(' ')).toLatin1()); { QSqlDatabase db = QSqlDatabase::addDatabase("BLAH_FOO_NONEXISTENT_DRIVER", "INVALID_CONNECTION"); diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index 4ed8b494615..5b15eb49ff7 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -2908,10 +2908,10 @@ void tst_QSqlQuery::queryOnInvalidDatabase() QSqlDatabase::removeDatabase("invalidConnection"); }); // Note: destruction of db needs to happen before we call removeDatabase. - QTest::ignoreMessage(QtWarningMsg, "QSqlDatabase: INVALID driver not loaded"); #if QT_CONFIG(regularexpression) QTest::ignoreMessage(QtWarningMsg, - QRegularExpression("QSqlDatabase: available drivers: ")); + QRegularExpression("QSqlDatabase: can not load requested driver " + "'INVALID', available drivers: ")); #endif QSqlDatabase db = QSqlDatabase::addDatabase("INVALID", "invalidConnection"); QVERIFY(db.lastError().isValid()); |