test: Remove QSKIP from tst_QFileDialog2
authorSergio Ahumada <sergio.ahumada@digia.com>
Sun, 21 Oct 2012 18:53:02 +0000 (20:53 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Thu, 25 Oct 2012 14:22:50 +0000 (16:22 +0200)
In task227930_correctNavigationKeyboardBehavior()

Task-number: QTBUG-23602
Change-Id: I07f40dbc3840c232e09ff1327f00e3fd9c16c22f
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
tests/auto/widgets/dialogs/qfiledialog2/tst_qfiledialog2.cpp

index 54663ba..6b0888f 100644 (file)
@@ -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()