From 57be602fdeddde96b37a5b42c0f81aac26d10348 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Mon, 25 Jul 2022 18:53:19 +0200 Subject: [PATCH] Fix test being flaky on Linux The cause is that the first EXPOSE event comes with the window not having focus yet. See QTBUG-105177. Also remove processEvents() as events are always processed when doing qWaitFor...(). Task-number: QTBUG-105177 Change-Id: I2260d1885388bbf7091c423bc9b4c16e2ed0090f Reviewed-by: Volker Hilsheimer --- tests/auto/gui/kernel/qwindow/BLACKLIST | 5 ----- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 3 +-- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/tests/auto/gui/kernel/qwindow/BLACKLIST b/tests/auto/gui/kernel/qwindow/BLACKLIST index f5786e7522..328d3f51b1 100644 --- a/tests/auto/gui/kernel/qwindow/BLACKLIST +++ b/tests/auto/gui/kernel/qwindow/BLACKLIST @@ -1,9 +1,4 @@ [positioning] -opensuse-leap -[positioning:default] -linux -macos ci -[positioning:fake] macos ci [modalWithChildWindow] # QTBUG-69160 diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index 11fb274ddc..acb35794f5 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -517,9 +517,8 @@ void tst_QWindow::positioning() QCOMPARE(window.geometry(), geometry); // explicitly use non-fullscreen show. show() can be fullscreen on some platforms window.showNormal(); - QCoreApplication::processEvents(); - QVERIFY(QTest::qWaitForWindowExposed(&window)); + QVERIFY(QTest::qWaitForWindowActive(&window)); QMargins originalMargins = window.frameMargins();