summaryrefslogtreecommitdiffstats
path: root/tests/auto
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-09-07 08:44:58 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-09-07 08:44:58 (GMT)
commit206769af3fe145dbc46628dba67ed3115fcbabf2 (patch)
tree7aa1c5d354cb4a5cd7350a52715f2d0229654614 /tests/auto
parentda4bfa273c955574d68dde1b44681de31a478ee0 (diff)
downloadQt-206769af3fe145dbc46628dba67ed3115fcbabf2.zip
Qt-206769af3fe145dbc46628dba67ed3115fcbabf2.tar.gz
Qt-206769af3fe145dbc46628dba67ed3115fcbabf2.tar.bz2
Stabilize QComboBox test.
On Mac, there is long fading animation before the popups hide
Diffstat (limited to 'tests/auto')
-rw-r--r--tests/auto/qcombobox/tst_qcombobox.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index be33862..0773184 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -879,12 +879,12 @@ void tst_QComboBox::hide()
{
testWidget->addItem("foo");
testWidget->showPopup();
- QTest::qWait(500); //allow combobox effect to complete
- QVERIFY(testWidget->view());
- QVERIFY(testWidget->view()->isVisible());
+ QTest::qWait(200); //allow combobox effect to complete
+ QTRY_VERIFY(testWidget->view());
+ QTRY_VERIFY(testWidget->view()->isVisible());
testWidget->hidePopup();
- QTest::qWait(500); //allow combobox effect to complete
- QVERIFY(!testWidget->view()->isVisible());
+ QTest::qWait(200); //allow combobox effect to complete
+ QTRY_VERIFY(!testWidget->view()->isVisible());
testWidget->hide();
QVERIFY(!testWidget->isVisible());
}