From 1395b81935d590aa1a44c7d4857f788a06f6c794 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 10 Sep 2012 12:12:36 +0200 Subject: [PATCH] test: Remove QSKIP from tst_QFocusEvent::checkReason_ActiveWindow() This test actually passes using the "xcb" platform and fails otherwise. Second, the Jira task is misleading since it refers to tst_QFocusEvent::checkReason_Shortcut() Change-Id: Icab91ace8c214d958b534c5cebae900242522372 Reviewed-by: Caroline Chao --- tests/auto/other/qfocusevent/tst_qfocusevent.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp index 2b20c34..a02462d 100644 --- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp +++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp @@ -352,6 +352,8 @@ void tst_QFocusEvent::checkReason_ActiveWindow() QDialog* d = new QDialog( testFocusWidget ); d->show(); + QVERIFY(QTest::qWaitForWindowExposed(d)); + d->activateWindow(); // ### CDE QApplication::setActiveWindow(d); QVERIFY(QTest::qWaitForWindowActive(d)); @@ -373,8 +375,6 @@ void tst_QFocusEvent::checkReason_ActiveWindow() #ifdef Q_OS_MAC QEXPECT_FAIL("", "QTBUG-22815", Abort); #endif - if (QGuiApplication::platformName() == QStringLiteral("xcb")) - QSKIP("QTBUG-22815 - This test is unstable on this platform"); QTRY_VERIFY(childFocusWidgetOne->focusInEventRecieved); QVERIFY(childFocusWidgetOne->focusInEventGotFocus); -- 2.7.4