summaryrefslogtreecommitdiffstats
path: root/tests/auto/qmdiarea
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-10-02 17:17:41 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-10-02 17:19:21 (GMT)
commite3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c (patch)
tree2b29d9836d9114bdb363c1f693411c0cc1c1a539 /tests/auto/qmdiarea
parent0981f27d76436f8058d8534b7454777910922ee0 (diff)
downloadQt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.zip
Qt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.tar.gz
Qt-e3fa7e2f0fd8f69d3de96af9ba0b868bd3ccc07c.tar.bz2
Stablilize autotests on X11
Diffstat (limited to 'tests/auto/qmdiarea')
-rw-r--r--tests/auto/qmdiarea/tst_qmdiarea.cpp10
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp
index 725c31e..a5b3848 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp
@@ -1776,9 +1776,9 @@ void tst_QMdiArea::tileSubWindows()
#endif
qApp->processEvents();
- QVERIFY(workspace.size() != QSize(150, 150));
- QVERIFY(!vBar->isVisible());
- QVERIFY(!hBar->isVisible());
+ QTRY_VERIFY(workspace.size() != QSize(150, 150));
+ QTRY_VERIFY(!vBar->isVisible());
+ QTRY_VERIFY(!hBar->isVisible());
}
void tst_QMdiArea::cascadeAndTileSubWindows()
@@ -1853,6 +1853,7 @@ void tst_QMdiArea::resizeMaximizedChildWindows()
#if defined(Q_WS_X11)
qt_x11_wait_for_window_manager(&workspace);
#endif
+ QTest::qWait(100);
workspace.resize(startSize, startSize);
workspace.setOption(QMdiArea::DontMaximizeSubWindowOnActivation);
QSize workspaceSize = workspace.size();
@@ -1865,6 +1866,7 @@ void tst_QMdiArea::resizeMaximizedChildWindows()
windows.append(window);
qApp->processEvents();
window->showMaximized();
+ QTest::qWait(100);
QVERIFY(window->isMaximized());
QSize windowSize = window->size();
QVERIFY(windowSize.isValid());
@@ -1874,7 +1876,7 @@ void tst_QMdiArea::resizeMaximizedChildWindows()
QTest::qWait(100);
qApp->processEvents();
QTRY_COMPARE(workspace.size(), workspaceSize + QSize(increment, increment));
- QCOMPARE(window->size(), windowSize + QSize(increment, increment));
+ QTRY_COMPARE(window->size(), windowSize + QSize(increment, increment));
workspaceSize = workspace.size();
}