1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Harden tst_QWindow::framePositioningStableAfterDestroy()

Browse Source 
StablePosition was in some cases recording a wrong position, as it was
taking the framePosition and considering it to be the widget's
position. That erroneous position was then used to place the window,
resulting in a correct position but a wrong framePosition.

Wait and check for the window.geometry() and the
window.frameGeometry() to be different. If not the frame
has not been updated, or there is no frame when there
should be one. The test will most likely fail because
of this.

Fix flakiness on Opensuse 15

Pick-to: 6.8 6.5
Change-Id: I8e05ee7769de4efc2ac55ec7afbe366f76e325db
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
(cherry picked from commit 21ef8bed6d738551c1a322e78366d3c347a0e09e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Frédéric Lefebvre 2025-01-02 10:03:39 +01:00 committed by Qt Cherry-pick Bot
parent d61c784273
commit e20364d6c9
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/auto/gui/kernel/qwindow/tst_qwindow.cpp
View File

@ -678,14 +678,18 @@ void tst_QWindow::framePositioningStableAfterDestroy()
window.show();
QVERIFY(QTest::qWaitForWindowExposed(&window));
const bool frameOk = QTest::qWaitFor([&]{return window.geometry() != window.frameGeometry(); });
if (!frameOk)
qCritical() << "Frame geometry failed to update";
const QPoint stablePosition = window.position();
const QPoint stableFramePosition = window.framePosition();
window.destroy();
window.show();
QVERIFY(QTest::qWaitForWindowExposed(&window));
QCOMPARE(window.position(), stablePosition);
QCOMPARE(window.framePosition(), stableFramePosition);
QTRY_COMPARE(window.position(), stablePosition);
QTRY_COMPARE(window.framePosition(), stableFramePosition);
}
void tst_QWindow::positioningDuringMinimized()