diff options
| author | Dimitrios Apostolou <jimis@qt.io> | 2022-07-29 12:45:16 +0200 |
|---|---|---|
| committer | Dimitrios Apostolou <jimis@qt.io> | 2022-08-17 01:05:45 +0200 |
| commit | 7524a36a26e6eead68fd3d26246f4567fdab0dc1 (patch) | |
| tree | 84a1fe69e98c9a92d6c7c8dce1f26d216cd721f3 /tests/auto/widgets/graphicsview | |
| parent | 74f3bc263abecc6b2eedf832bed89cc6c733bc66 (diff) | |
Stabilize test by not activating window
Window activation is not working reliably on X11 when combined with
X11BypassWindowManagerHint, see QXcbWindow::requestActivateWindow().
The test itself counts repaints, so qWaitForWindowExposed() shouldn't be
needed.
This way we don't need to QSKIP() the test if window activation fails.
Fixes: QTBUG-98921
Change-Id: I849b7261c757fb7cbcde73f11bbe1a74a862cb9c
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/widgets/graphicsview')
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST | 3 | ||||
| -rw-r--r-- | tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST b/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST index 65a6f5b8b9..cad381b7b7 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/BLACKLIST @@ -6,6 +6,3 @@ b2qt [updateFocusChainWhenChildDie] b2qt qnx -[initialShow] -macos ci -opensuse-leap diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 89548337aa..fedb82e641 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -3098,9 +3098,7 @@ void tst_QGraphicsWidget::initialShow() dummyView->setWindowFlags(Qt::X11BypassWindowManagerHint); EventSpy paintSpy(dummyView->viewport(), QEvent::Paint); dummyView->show(); - qApp->setActiveWindow(dummyView.data()); - if (!QTest::qWaitForWindowActive(dummyView.data())) - QSKIP("Graphics view failed to show (possibly due to Qt::X11BypassWindowManagerHint"); + QVERIFY(QTest::qWaitForWindowExposed(dummyView.data())); const int expectedRepaintCount = paintSpy.count(); dummyView.reset(); @@ -3113,8 +3111,7 @@ void tst_QGraphicsWidget::initialShow() QGraphicsView view(&scene); view.setWindowFlags(view.windowFlags()|Qt::X11BypassWindowManagerHint); view.show(); - qApp->setActiveWindow(&view); - QVERIFY(QTest::qWaitForWindowActive(&view)); + QVERIFY(QTest::qWaitForWindowExposed(&view)); QTRY_COMPARE(widget->repaints, expectedRepaintCount); } |