From ee366df58f3eaf88c7775367d766d3f98647554e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 15 Dec 2017 14:50:41 +0100 Subject: Fix the TestFolderMan on Windows --- test/testfolderman.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'test/testfolderman.cpp') diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp index 39c657a05..15f044ba1 100644 --- a/test/testfolderman.cpp +++ b/test/testfolderman.cpp @@ -107,7 +107,7 @@ private slots: QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/sub/ownCloud1/folder").isNull()); QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/sub/ownCloud1/folder/f").isNull()); - +#ifndef Q_OS_WIN // no links on windows, no permissions // make a bunch of links QVERIFY(QFile::link(dirPath + "/sub/free", dirPath + "/link1")); QVERIFY(QFile::link(dirPath + "/sub", dirPath + "/link2")); @@ -129,7 +129,6 @@ private slots: QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/link4").isNull()); QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/link3/folder").isNull()); - // test some non existing sub path (error) QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/sub/ownCloud1/some/sub/path").isNull()); QVERIFY(!folderman->checkPathValidityForNewFolder(dirPath + "/ownCloud2/blublu").isNull()); @@ -140,12 +139,13 @@ private slots: QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link1/subfolder").isNull()); QVERIFY(folderman->checkPathValidityForNewFolder(dirPath + "/link2/free/subfolder").isNull()); - // Invalid paths - QVERIFY(!folderman->checkPathValidityForNewFolder("").isNull()); - // Should not have the rights QVERIFY(!folderman->checkPathValidityForNewFolder("/").isNull()); QVERIFY(!folderman->checkPathValidityForNewFolder("/usr/bin/somefolder").isNull()); +#endif + + // Invalid paths + QVERIFY(!folderman->checkPathValidityForNewFolder("").isNull()); } void testFindGoodPathForNewSyncFolder() -- cgit v1.2.3