Mark tst_qabstractitemmodel as insignificant after QHash randomization

The testChildrenLayoutsChanged fails randomly. This happens rarely,
f.i. wasn't spotted by CI when QHash randomization itself was merged;
but is indeed reproducible by running the test a few times in a row.

This is now blocking api_merges integration, and I have no idea
how to fix it.

This patch marks the test as insignificant for now (the bug
tracking this test failure is QTBUG-25325), and switches the failing
tests from QVERIFY(a == b) to a proper QCOMPARE (so that the
expected values do show up in the build logs).

Change-Id: I16f0e28bcbb06dbac2e7169f4676a19ccf626a92
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro
index 9e59251..8bfe662 100644 (file)
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/qabstractitemmodel.pro
@@ -6,3 +6,4 @@ mtdir = ../../../other/modeltest
 INCLUDEPATH += $$PWD/$${mtdir}
 SOURCES = tst_qabstractitemmodel.cpp $${mtdir}/dynamictreemodel.cpp $${mtdir}/modeltest.cpp
 HEADERS = $${mtdir}/dynamictreemodel.h $${mtdir}/modeltest.h
+CONFIG += insignificant_test # QTBUG-25325

diff --git a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
index 8d451db..28babdb 100644 (file)
--- a/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
+++ b/tests/auto/corelib/itemmodels/qabstractitemmodel/tst_qabstractitemmodel.cpp
@@ -2135,8 +2135,8 @@ void tst_QAbstractItemModel::testChildrenLayoutsChanged()
 
         QVERIFY(p1FirstPersistent.row() == 1);
         QVERIFY(p1LastPersistent.row() == 0);
-        QVERIFY(p2FirstPersistent.row() == 9);
-        QVERIFY(p2LastPersistent.row() == 8);
+        QCOMPARE(p2FirstPersistent.row(), 9);
+        QCOMPARE(p2LastPersistent.row(), 8);
     }
 }