From befc373ea6f201cff65ff77f635df22751fbc037 Mon Sep 17 00:00:00 2001 From: Hannah von Reth Date: Thu, 26 Nov 2020 15:03:11 +0100 Subject: [PATCH] Fix test on systems where C:\ is not writeable --- src/gui/folderman.cpp | 4 +++- test/testfolderman.cpp | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/gui/folderman.cpp b/src/gui/folderman.cpp index 04d6eef60..87ecc4fb9 100644 --- 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 21a475327..66db0128b 100644 --- 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()); -- 2.30.2