From b8dd9e304157a7099fb424b464bfb33dfa526438 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Sun, 21 Oct 2012 20:53:02 +0200 Subject: test: Remove QSKIP from tst_QFileDialog2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In task227930_correctNavigationKeyboardBehavior() Task-number: QTBUG-23602 Change-Id: I07f40dbc3840c232e09ff1327f00e3fd9c16c22f Reviewed-by: Morten Johan Sørvig --- tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'tests/auto/widgets/dialogs') diff --git a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp index 54663ba3a3..6b0888f68a 100644 --- a/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp +++ b/tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp @@ -121,7 +121,9 @@ private slots: void task178897_minimumSize(); void task180459_lastDirectory_data(); void task180459_lastDirectory(); +#ifndef Q_OS_MAC void task227930_correctNavigationKeyboardBehavior(); +#endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void task226366_lowerCaseHardDriveWindows(); #endif @@ -595,11 +597,12 @@ void tst_QFileDialog2::task227304_proxyOnFileDialog() } #endif +#ifndef Q_OS_MAC +// The following test implies the folder created will appear first in +// the list. On Mac files sorting depends on the locale and the order +// displayed cannot be known for sure. void tst_QFileDialog2::task227930_correctNavigationKeyboardBehavior() { -#if defined (Q_OS_MAC) || defined (Q_OS_LINUX) - QSKIP("This test currently fails on Mac OS X and linux CI, see QTBUG-23602"); -#endif QDir current = QDir::currentPath(); current.mkdir("test"); current.cd("test"); @@ -635,6 +638,7 @@ void tst_QFileDialog2::task227930_correctNavigationKeyboardBehavior() current.rmdir("test"); current.rmdir("test2"); } +#endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) void tst_QFileDialog2::task226366_lowerCaseHardDriveWindows() -- cgit v1.2.3