qiurui
/
qtdeclarative
mirror of https://github.com/qt/qtdeclarative.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix flaky tst_qquickmenu test 

The important part of the "cascading" test is checking that the sub-sub
menu eventually opens, so move the !visible check to the non-cascading
branch of the if statement.

Change-Id: I5a09bf0b5d45832f7b75c3e8c397fdb9e6fcc011
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
This commit is contained in:
Mitch Curtis 2019-05-06 17:04:27 +02:00 committed by Jüri Valdmann
parent 0525d640cd
commit 7d001497dd
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tests/auto/qquickmenu/tst_qquickmenu.cpp
View File

@ -1105,8 +1105,9 @@ void tst_QQuickMenu::subMenuMouse()
QCOMPARE(mainMenu->isVisible(), cascade);
QVERIFY(subMenu1->isVisible());
QVERIFY(!subMenu2->isVisible());
QVERIFY(!subSubMenu1->isVisible());
if (cascade) {
if (!cascade) {
QVERIFY(!subSubMenu1->isVisible());
} else {
QTRY_VERIFY(subSubMenu1->isVisible());
QTRY_VERIFY(subSubMenu1->isOpened());
}