diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-03-23 17:58:45 +0200 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-12 12:48:12 +0000 |
commit | a88063008d0715091e33022d8da5b589ce568b38 (patch) | |
tree | 2f60014208f23f94eaa4e578163ee4a80837b704 /tests/auto/widgets | |
parent | b0969828998bb838a2612b4909c36cf2fd8ec89a (diff) |
Blacklist tst_QItemDelegate::comboBox on openSUSE
This failed (occasionally) in finding the editor widget, so wait for the window
to be shown properly. Also enter the event loop with QTRY_VERIFY and not for a
fixed time of 1 s.
This however just moved the point of failure. Now the test fails since the
clearing and setting of focus does not dismiss the editor widget sometimes, so
still blacklist it.
Task-number: QTBUG-67282
Task-number: QTBUG-66216
Change-Id: Iec598609fce23a25d7b955082d0973685d612715
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets')
-rw-r--r-- | tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST | 3 | ||||
-rw-r--r-- | tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST index fea108f3fd..0f7c377194 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST +++ b/tests/auto/widgets/itemviews/qitemdelegate/BLACKLIST @@ -2,3 +2,6 @@ opensuse-42.3 ci [testLineEditValidation] opensuse-42.3 ci +[comboBox] +# QTBUG-67282 +opensuse diff --git a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp index 2fed2e0c69..802a04b4bf 100644 --- a/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/widgets/itemviews/qitemdelegate/tst_qitemdelegate.cpp @@ -1389,13 +1389,12 @@ void tst_QItemDelegate::comboBox() QTableWidget widget(1, 1); widget.setItem(0, 0, item1); widget.show(); + QVERIFY(QTest::qWaitForWindowExposed(&widget)); widget.editItem(item1); - QTestEventLoop::instance().enterLoop(1); - - QComboBox *boolEditor = widget.viewport()->findChild<QComboBox*>(); - QVERIFY(boolEditor); + QComboBox *boolEditor = nullptr; + QTRY_VERIFY( (boolEditor = widget.viewport()->findChild<QComboBox*>()) ); QCOMPARE(boolEditor->currentIndex(), 1); // True is selected initially. // The data must actually be different in order for the model // to be updated. |