From fcb3be512001338c9aa7454616a74d7a606c05ab Mon Sep 17 00:00:00 2001 From: Shawn Rutledge Date: Mon, 23 Dec 2024 22:30:38 +0100 Subject: [PATCH] Skip parts of customContextMenu and sharedContextMenu tests on Windows Pick-to: 6.9 Task-number: QTBUG-132436 Change-Id: I95e6178c4453e35bc392118d6758a91074b7951a Reviewed-by: Shawn Rutledge --- .../qquickcontextmenu/tst_qquickcontextmenu.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tests/auto/quickcontrols/qquickcontextmenu/tst_qquickcontextmenu.cpp b/tests/auto/quickcontrols/qquickcontextmenu/tst_qquickcontextmenu.cpp index e586170d29..4c42fb39a0 100644 --- a/tests/auto/quickcontrols/qquickcontextmenu/tst_qquickcontextmenu.cpp +++ b/tests/auto/quickcontrols/qquickcontextmenu/tst_qquickcontextmenu.cpp @@ -72,6 +72,11 @@ void tst_QQuickContextMenu::customContextMenu() QTRY_COMPARE(menu->isOpened(), !contextMenuTriggeredOnRelease); QTest::mouseRelease(window, Qt::RightButton, Qt::NoModifier, tomatoCenter); + +#ifdef Q_OS_WIN + if (qgetenv("QTEST_ENVIRONMENT").split(' ').contains("ci")) + QSKIP("Menu fails to open on Windows (QTBUG-132436)"); +#endif QTRY_COMPARE(menu->isOpened(), true); // Popups are positioned relative to their parent, and it should be opened at the center: @@ -104,6 +109,10 @@ void tst_QQuickContextMenu::sharedContextMenu() auto menus = window->findChildren(); QCOMPARE(menus.count(), 1); QPointer menu = menus.first(); +#ifdef Q_OS_WIN + if (qgetenv("QTEST_ENVIRONMENT").split(' ').contains("ci")) + QSKIP("Menu fails to open on Windows (QTBUG-132436)"); +#endif QTRY_VERIFY(menu->isOpened()); QCOMPARE(menu->parentItem(), tomato); QCOMPARE(menu->itemAt(0)->property("text").toString(), "Eat tomato");