Test: Remove QSKIP from tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut

The test is passing on Ubuntu 11.10.

Adding qWaitForWindowExposed after the line edit show() call to ensure
the line edit is actually shown on the screen.

Task-number: QTBUG-24518
Change-Id: I2af65bef76d171b36032120738dfbd7cfff51d7f
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>

diff --git a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
index b4ab72e..40eff1f 100644 (file)
--- a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
+++ b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro
@@ -3,6 +3,4 @@ TARGET = tst_qlineedit
 QT += gui-private core-private widgets widgets-private testlib
 SOURCES  += tst_qlineedit.cpp
 
-# QTBUG-24518 - unstable test
-linux-*:system(". /etc/lsb-release && [ $DISTRIB_CODENAME = oneiric ]"):DEFINES+=UBUNTU_ONEIRIC
 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

diff --git a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
index 4dc8cbb..9254e82 100644 (file)
--- a/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
+++ b/tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
@@ -3635,9 +3635,6 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash()
 
 void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
 {
-#if defined(UBUNTU_ONEIRIC) && defined(__x86_64__)
-    QSKIP("QTBUG-24518 - Unstable test for Ubuntu 11.10");
-#endif
     //ReadOnly QLineEdit should not intercept shortcut.
     QLineEdit le;
     le.setReadOnly(true);
@@ -3648,6 +3645,7 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
     le.addAction(&action);
 
     le.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&le));
     QApplication::setActiveWindow(&le);
     QVERIFY(QTest::qWaitForWindowActive(&le));
     le.setFocus();