summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJason McDonald <jason.mcdonald@nokia.com>2012-04-18 00:26:36 +1000
committerQt by Nokia <qt-info@nokia.com>2012-04-19 08:07:39 +0200
commita594e5cfc8098c236f113e292938c791d42a3103 (patch)
tree3c9078ca39850440247217110d0678853e5be76b /tests
parent25f3c16c94eaa0934b5f2cc1ee373eea71aa5d02 (diff)
Remove insignification from QFocusEvent test on Mac OS X.
This test has one stable failure. Mark that failure with QEXPECT_FAIL and re-enable the test. Task-number: QTBUG-22815 Change-Id: I38445b659235076b00d9dd82d2a824d1caa1439b Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/other/qfocusevent/qfocusevent.pro1
-rw-r--r--tests/auto/other/qfocusevent/tst_qfocusevent.cpp3
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/auto/other/qfocusevent/qfocusevent.pro b/tests/auto/other/qfocusevent/qfocusevent.pro
index ee2cf22a6a..5f799291c6 100644
--- a/tests/auto/other/qfocusevent/qfocusevent.pro
+++ b/tests/auto/other/qfocusevent/qfocusevent.pro
@@ -2,4 +2,3 @@ CONFIG += testcase
TARGET = tst_qfocusevent
QT += widgets testlib
SOURCES += tst_qfocusevent.cpp
-mac: CONFIG += insignificant_test # QTBUG-22815
diff --git a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
index 946003fc72..05a609c8a6 100644
--- a/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
+++ b/tests/auto/other/qfocusevent/tst_qfocusevent.cpp
@@ -378,6 +378,9 @@ void tst_QFocusEvent::checkReason_ActiveWindow()
#if defined(Q_OS_IRIX)
QEXPECT_FAIL("", "IRIX requires explicit activateWindow(), so this test does not make any sense.", Abort);
#endif
+#ifdef Q_OS_MAC
+ QEXPECT_FAIL("", "QTBUG-22815", Abort);
+#endif
QTRY_VERIFY(childFocusWidgetOne->focusInEventRecieved);
QVERIFY(childFocusWidgetOne->focusInEventGotFocus);