Fix test on systems where C:\ is not writeable

diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp
index 04d6eef60a2c4264141b6d11cf261f7aa8a3fb5e..87ecc4fb9e75410fd0568c4e1ce5daab2aa980ee 100644 (file)
--- a/src/gui/folderman.cpp
+++ b/src/gui/folderman.cpp
@@ -1503,8 +1503,10 @@ static QString canonicalPath(const QString &path)
 QString FolderMan::checkPathValidityForNewFolder(const QString &path, const QUrl &serverUrl) const
 {
     QString recursiveValidity = checkPathValidityRecursive(path);
-    if (!recursiveValidity.isEmpty())
+    if (!recursiveValidity.isEmpty()) {
+        qCDebug(lcFolderMan) << path << recursiveValidity;
         return recursiveValidity;
+    }
 
     // check if the local directory isn't used yet in another ownCloud sync
     Qt::CaseSensitivity cs = Qt::CaseSensitive;

diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp
index 21a475327fe4fa2067b2f26cb4607cd97fbf4e82..66db0128ba5c7d17aa17cb9da9258e89a9d6524e 100644 (file)
--- a/test/testfolderman.cpp
+++ b/test/testfolderman.cpp
@@ -27,6 +27,9 @@ class TestFolderMan: public QObject
 private slots:
     void testCheckPathValidityForNewFolder()
     {
+#ifdef Q_OS_WIN
+        Utility::NtfsPermissionLookupRAII ntfs_perm;
+#endif
         QTemporaryDir dir;
         ConfigFile::setConfDir(dir.path()); // we don't want to pollute the user's config file
         QVERIFY(dir.isValid());