From b27e922e1c74f467843b7b8a01c2229b0fee5367 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Mon, 29 Apr 2013 12:13:11 +0200 Subject: test: Mark tst_menubar::task256322_highlight as XFAIL This test is unstable on Mac OS 10.7 with developer builds, so marking it as XFAIL if it happens to fail. Task-number: QTBUG-30565 Change-Id: If7094c3b19299f0dbe57cb82a8614032a75573d8 Reviewed-by: Friedemann Kleint Reviewed-by: Iikka Eklund --- tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp index d1e6693608..e7450fdd2c 100644 --- a/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/widgets/widgets/qmenubar/tst_qmenubar.cpp @@ -1184,7 +1184,12 @@ void tst_QMenuBar::task256322_highlight() QTest::mouseMove(win.menuBar(), nothingCenter); QTRY_VERIFY(!menu2.isVisible()); QVERIFY(!menu.isVisible()); - QCOMPARE(win.menuBar()->activeAction(), nothing); + QAction *activeAction = win.menuBar()->activeAction(); +#ifdef Q_OS_MAC + if ((QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) && (activeAction != nothing)) + QEXPECT_FAIL("", "QTBUG-30565: Unstable test", Continue); +#endif + QCOMPARE(activeAction, nothing); QTest::mouseRelease(win.menuBar(), Qt::LeftButton, 0, nothingCenter); } -- cgit v1.2.3