diff options
| author | Jo Asplin <jo.asplin@nokia.com> | 2011-11-04 14:41:04 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-11-07 13:26:41 +0100 |
| commit | e0dfa4547ec89b69acf20af91587a12cef96cfe4 (patch) | |
| tree | 8711cb9a08532db00ba2194643bedbeae35eaba5 | |
| parent | eb7192a96d5fa7a55ed07b7170db93f68ae6e768 (diff) | |
Re-enabled passing tests in tst_qmenu
To increase the effective test coverage, this patch
re-enables the tst_qmenu test case as such, and
instead disables only the test functions that are currently
failing in CI.
Task-number: QTBUG-22453
Change-Id: I62cc1a2a9b0206595808deafb5fc137888ec97b3
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/qmenu.pro | 2 | ||||
| -rw-r--r-- | tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qmenu/qmenu.pro b/tests/auto/widgets/widgets/qmenu/qmenu.pro index 29113da3d6..f919c12cb5 100644 --- a/tests/auto/widgets/widgets/qmenu/qmenu.pro +++ b/tests/auto/widgets/widgets/qmenu/qmenu.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qmenu QT += widgets testlib SOURCES += tst_qmenu.cpp - -contains(QT_CONFIG,xcb):CONFIG+=insignificant_test # QTBUG-21100, unstably fails diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index a83785a1a0..e4f12c9f65 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -564,6 +564,7 @@ void tst_QMenu::tearOff() QTest::mouseClick(menu, Qt::LeftButton, 0, QPoint(3, 3), 10); QTest::qWait(100); + QEXPECT_FAIL("", "QTBUG-22565", Abort); QVERIFY(menu->isTearOffMenuVisible()); QPointer<QMenu> torn = 0; foreach (QWidget *w, QApplication::allWidgets()) { @@ -638,6 +639,7 @@ void tst_QMenu::activeSubMenuPosition() // to check that submenu is to the right of the main menu too. #ifndef Q_OS_WINCE_WM QVERIFY(sub->pos().x() > main->pos().x()); + QEXPECT_FAIL("", "QTBUG-22565", Abort); QCOMPARE(sub->activeAction(), subAction); #endif } |