diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-10-21 20:53:02 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-10-25 16:22:50 +0200 |
commit | b8dd9e304157a7099fb424b464bfb33dfa526438 (patch) | |
tree | 0579a9c268f680b7d52f506e3a7683abe7c11f5f /tests/auto/widgets/dialogs/qfiledialog2 | |
parent | c3237f58abef192c49320bf39c2d4cbe9a791c27 (diff) |
test: Remove QSKIP from tst_QFileDialog2
In task227930_correctNavigationKeyboardBehavior()
Task-number: QTBUG-23602
Change-Id: I07f40dbc3840c232e09ff1327f00e3fd9c16c22f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'tests/auto/widgets/dialogs/qfiledialog2')
-rw-r--r-- | tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
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() |