From 06942138d6fc274777c57b4d30b34fa64ca8f1e4 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Wed, 2 Feb 2022 17:24:12 +0100 Subject: Move prematureExec() to the end of tst_qsqlquery's testing It leaves the system in a state that breaks at least one later test, so put it last. (This was first seen when picking back to 6.2, but I am now able to reproduce it on dev.) Amends commit 78eac57f3dc788345f8f3e9b6dbd3dce70b8f511 Pick-to: 6.3 Change-Id: I918cf43cdfc27357329a175518d6f9755747bae5 Reviewed-by: Andy Shaw Reviewed-by: Volker Hilsheimer --- tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'tests/auto/sql/kernel') diff --git a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp index d7a4e8840c..85c21dd15c 100644 --- a/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp +++ b/tests/auto/sql/kernel/qsqlquery/tst_qsqlquery.cpp @@ -70,8 +70,6 @@ private slots: void query_exec(); void execErrorRecovery_data() { generic_data(); } void execErrorRecovery(); - void prematureExec_data() { generic_data(); } - void prematureExec(); void first_data() { generic_data(); } void first(); void next_data() { generic_data(); } @@ -271,6 +269,10 @@ private slots: void ibaseArray_data() { generic_data("QIBASE"); } void ibaseArray(); + // Double addDatabase() with same name leaves system in a state that breaks + // invalidQuery() if run later; so put this one last ! + void prematureExec_data() { generic_data(); } + void prematureExec(); private: // returns all database connections void generic_data(const QString &engine=QString()); -- cgit v1.2.3