diff options
| author | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-03-13 12:52:27 +0100 |
|---|---|---|
| committer | Vitaly Fanaskov <vitaly.fanaskov@qt.io> | 2020-03-13 20:10:35 +0100 |
| commit | 814e87ce4bdd6c0f217866f3f4888f3ecffb9825 (patch) | |
| tree | 52bb3127c539af2094f81e044fe147c760c9fae0 /tests | |
| parent | 35bc1f839448f05972d397a0bb3d79a4538d6f3c (diff) | |
tst_qquickwindow::testWindowVisibilityOrder: remove unstable check
The problem here is that it's not possible to guarantee that a certain
window has focus in this scenario. Furthermore, this test is not about
focus at all.
Task-number: QTBUG-62604
Change-Id: I941446d67b41571f59bcf10cbabfba1895bf2fca
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/quick/qquickwindow/tst_qquickwindow.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp index 0bf83c267a..82814bd078 100644 --- a/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp +++ b/tests/auto/quick/qquickwindow/tst_qquickwindow.cpp @@ -2117,15 +2117,9 @@ void tst_qquickwindow::testWindowVisibilityOrder() QWindowList windows = QGuiApplication::topLevelWindows(); QTRY_COMPARE(windows.size(), 5); - if (qgetenv("XDG_CURRENT_DESKTOP") == "Unity" && QGuiApplication::focusWindow() != window3) { - qDebug() << "Unity (flaky QTBUG-62604): expected window3 to have focus; actual focusWindow:" - << QGuiApplication::focusWindow(); - } else { - QCOMPARE(window3, QGuiApplication::focusWindow()); - QVERIFY(window1->isActive()); - QVERIFY(window2->isActive()); - QVERIFY(window3->isActive()); - } + QVERIFY(window1->isActive()); + QVERIFY(window2->isActive()); + QVERIFY(window3->isActive()); //Test if window4 is shown 2 seconds after the application startup //with window4 visible window5 (transient child) should also become visible |