AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Test: Remove QSKIP from tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut

Browse Source 
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>
This commit is contained in:
Caroline Chao 2012-09-21 12:28:15 +02:00 committed by The Qt Project
parent 461a01c1df
commit 01a985ac5b
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/auto/widgets/widgets/qlineedit/qlineedit.pro
View File

@ -3,6 +3,4 @@ TARGET = tst_qlineedit
QT += gui-private core-private widgets widgets-private testlib QT += gui-private core-private widgets widgets-private testlib
SOURCES += tst_qlineedit.cpp 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 DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0

4
tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp
View File

@ -3635,9 +3635,6 @@ void tst_QLineEdit::taskQTBUG_7902_contextMenuCrash()
void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut() 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. //ReadOnly QLineEdit should not intercept shortcut.
QLineEdit le; QLineEdit le;
le.setReadOnly(true); le.setReadOnly(true);
@ -3648,6 +3645,7 @@ void tst_QLineEdit::taskQTBUG_7395_readOnlyShortcut()
le.addAction(&action); le.addAction(&action);
le.show(); le.show();
QVERIFY(QTest::qWaitForWindowExposed(&le));
QApplication::setActiveWindow(&le); QApplication::setActiveWindow(&le);
QVERIFY(QTest::qWaitForWindowActive(&le)); QVERIFY(QTest::qWaitForWindowActive(&le));
le.setFocus(); le.setFocus();