From f18ea32865521e21f47ea2745181e0e70db0266f Mon Sep 17 00:00:00 2001
From: Olivier Goffart <ogoffart@trolltech.com>
Date: Tue, 6 Oct 2009 10:15:42 +0200
Subject: Stabilize tests on X11
---
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 7 ++++---
tests/auto/qmdiarea/tst_qmdiarea.cpp | 2 +-
tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp | 6 +++---
tests/auto/qtableview/tst_qtableview.cpp | 4 ++--
tests/auto/qwidget/tst_qwidget.cpp | 3 ++-
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
index edea6b8..e4eaf4e 100644
--- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
+++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
@@ -7301,16 +7301,17 @@ void tst_QGraphicsItem::itemUsesExtendedStyleOption()
rect->startTrack = false;
view.show();
QTest::qWaitForWindowShown(&view);
+ QTest::qWait(60);
rect->startTrack = true;
rect->update(10, 10, 10, 10);
- QTest::qWait(12);
+ QTest::qWait(60);
rect->startTrack = false;
rect->setFlag(QGraphicsItem::ItemUsesExtendedStyleOption, true);
QVERIFY((rect->flags() & QGraphicsItem::ItemUsesExtendedStyleOption));
- QTest::qWait(12);
+ QTest::qWait(60);
rect->startTrack = true;
rect->update(10, 10, 10, 10);
- QTest::qWait(12);
+ QTest::qWait(60);
}
void tst_QGraphicsItem::itemSendsGeometryChanges()
diff --git a/tests/auto/qmdiarea/tst_qmdiarea.cpp b/tests/auto/qmdiarea/tst_qmdiarea.cpp
index a5b3848..068d1fa 100644
--- a/tests/auto/qmdiarea/tst_qmdiarea.cpp
+++ b/tests/auto/qmdiarea/tst_qmdiarea.cpp
@@ -1759,7 +1759,7 @@ void tst_QMdiArea::tileSubWindows()
// Horizontal scroll bar.
QScrollBar *hBar = workspace.horizontalScrollBar();
QCOMPARE(workspace.horizontalScrollBarPolicy(), Qt::ScrollBarAsNeeded);
- QVERIFY(hBar->isVisible());
+ QTRY_VERIFY(hBar->isVisible());
QCOMPARE(hBar->value(), 0);
QCOMPARE(hBar->minimum(), 0);
diff --git a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
index 8258e15..b556b87 100644
--- a/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
+++ b/tests/auto/qmdisubwindow/tst_qmdisubwindow.cpp
@@ -1003,9 +1003,9 @@ void tst_QMdiSubWindow::setSystemMenu()
mainWindow.setCentralWidget(mdiArea);
mainWindow.menuBar();
mainWindow.show();
-#ifdef Q_WS_X11
- qt_x11_wait_for_window_manager(&mainWindow);
-#endif
+ QTest::qWaitForWindowShown(&mainWindow);
+ QTest::qWait(60);
+
QTRY_VERIFY(subWindow->isVisible());
QPoint globalPopupPos;
diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp
index 09e1e87..deb0b71 100644
--- a/tests/auto/qtableview/tst_qtableview.cpp
+++ b/tests/auto/qtableview/tst_qtableview.cpp
@@ -2339,7 +2339,7 @@ void tst_QTableView::scrollTo()
QSize forcedSize(columnWidth * 2, rowHeight * 2);
view.resize(forcedSize);
QTest::qWaitForWindowShown(&view);
- QTest::qWait(0);
+ QTest::qWait(50);
QTRY_COMPARE(view.size(), forcedSize);
view.setModel(&model);
@@ -2354,7 +2354,7 @@ void tst_QTableView::scrollTo()
for (int c = 0; c < columnCount; ++c)
view.setColumnWidth(c, columnWidth);
- QTest::qWait(100); // ### needed to pass the test
+ QTest::qWait(150); // ### needed to pass the test
view.horizontalScrollBar()->setValue(horizontalScroll);
view.verticalScrollBar()->setValue(verticalScroll);
diff --git a/tests/auto/qwidget/tst_qwidget.cpp b/tests/auto/qwidget/tst_qwidget.cpp
index 92658a6..5ab273c 100644
--- a/tests/auto/qwidget/tst_qwidget.cpp
+++ b/tests/auto/qwidget/tst_qwidget.cpp
@@ -9118,7 +9118,7 @@ void tst_QWidget::paintOutsidePaintEvent()
widget.show();
QTest::qWaitForWindowShown(&widget);
- QTest::qWait(20);
+ QTest::qWait(60);
const QPixmap before = QPixmap::grabWindow(widget.winId());
@@ -9128,6 +9128,7 @@ void tst_QWidget::paintOutsidePaintEvent()
painter.fillRect(child1.rect(), Qt::red);
painter.end();
XSync(QX11Info::display(), false); // Flush output buffer.
+ QTest::qWait(60);
const QPixmap after = QPixmap::grabWindow(widget.winId());
--
cgit v0.12