From 01a985ac5bcc843ef44091d7f272a7c10bee989c Mon Sep 17 00:00:00 2001 From: Caroline Chao Date: Fri, 21 Sep 2012 12:28:15 +0200 Subject: [PATCH] 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 --- tests/auto/widgets/widgets/qlineedit/qlineedit.pro | 2 -- tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/auto/widgets/widgets/qlineedit/qlineedit.pro b/tests/auto/widgets/widgets/qlineedit/qlineedit.pro index b4ab72e96a3..40eff1f9689 100644 --- 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 4dc8cbb31e4..9254e825322 100644 --- 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();