diff options
author | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-04 12:57:51 +0300 |
---|---|---|
committer | Kari Oikarinen <kari.oikarinen@qt.io> | 2018-04-24 05:01:57 +0000 |
commit | 15ada2b91798638c90630c332e4a8caef7660638 (patch) | |
tree | bac271959a1dc7050ae74ed1950bdfd476b4f723 /tests/auto/widgets/kernel/qwindowcontainer | |
parent | c579f49e2a80a55a4004ff8e5b2ee76bda146387 (diff) |
tests/auto/widgets/kernel: Avoid unconditional qWait()s
Task-number: QTBUG-63992
Change-Id: Icb32b516002c3bb2841c8e7a29624e54cfcbbcac
Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
Diffstat (limited to 'tests/auto/widgets/kernel/qwindowcontainer')
-rw-r--r-- | tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp index a3e549aa50..c9c8e193b3 100644 --- a/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp +++ b/tests/auto/widgets/kernel/qwindowcontainer/tst_qwindowcontainer.cpp @@ -146,13 +146,7 @@ void tst_QWindowContainer::testExposeObscure() container->hide(); - QElapsedTimer timer; - timer.start(); - while (window->numberOfObscures == 0 && timer.elapsed() < 5000) { - QTest::qWait(10); - } - - QVERIFY(window->numberOfObscures > 0); + QTRY_VERIFY(window->numberOfObscures > 0); } @@ -345,11 +339,9 @@ void tst_QWindowContainer::testDockWidget() QVERIFY(QTest::qWaitForWindowExposed(&mainWindow)); QCOMPARE(window->parent(), mainWindow.window()->windowHandle()); - QTest::qWait(1000); dock->setFloating(true); QTRY_VERIFY(window->parent() != mainWindow.window()->windowHandle()); - QTest::qWait(1000); dock->setFloating(false); QTRY_COMPARE(window->parent(), mainWindow.window()->windowHandle()); } |