diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-17 23:08:37 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-17 16:28:46 +0200 |
| commit | d43c931cf0760defbd210cdaaced995c2d9346fc (patch) | |
| tree | 31ba7069ca589f4e737fe1c50944527d2c06d3d5 /tests/auto/gui | |
| parent | 46556529ecaa85b2e37c2be9a83a003ff92cfd7a (diff) | |
Remove insignfication from QGuiApplication test on Windows.
This test has two stable failures, one of which slipped through while
the test was disabled. Mark the failures with QEXPECT_FAIL and
re-enable the test.
Task-number: QTBUG-24186
Change-Id: Ie24f86603a01634d6eec5a42baa77e966f9388c8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/gui')
| -rw-r--r-- | tests/auto/gui/kernel/qguiapplication/qguiapplication.pro | 2 | ||||
| -rw-r--r-- | tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro index 777e2c6b1a..fffa097d73 100644 --- a/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro +++ b/tests/auto/gui/kernel/qguiapplication/qguiapplication.pro @@ -2,5 +2,3 @@ CONFIG += testcase TARGET = tst_qguiapplication QT += core gui testlib SOURCES = tst_qguiapplication.cpp - -win32:CONFIG += insignificant_test # QTBUG-24186 diff --git a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp index c0242d95c5..29b65d1fd4 100644 --- a/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp +++ b/tests/auto/gui/kernel/qguiapplication/tst_qguiapplication.cpp @@ -116,6 +116,9 @@ void tst_QGuiApplication::focusObject() QTest::qWaitForWindowShown(&window2); QTRY_COMPARE(app.focusWindow(), &window2); QCOMPARE(app.focusObject(), &obj3); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24186", Abort); +#endif QCOMPARE(spy.count(), 1); // focus change on unfocused window does not show @@ -238,6 +241,9 @@ void tst_QGuiApplication::changeFocusWindow() window2.requestActivateWindow(); QTRY_COMPARE(app.focusWindow(), &window2); QCOMPARE(window1.windowDuringFocusAboutToChange, &window1); +#ifdef Q_OS_WIN + QEXPECT_FAIL("", "QTBUG-24186", Abort); +#endif QCOMPARE(window1.windowDuringFocusOut, &window2); } |