diff options
| author | Christian Kamm <mail@ckamm.de> | 2016-11-22 15:09:56 +0300 |
|---|---|---|
| committer | Christian Kamm <mail@ckamm.de> | 2016-11-23 18:47:56 +0300 |
| commit | 3e59a9b31600270b7c037c3b6149a51292626b3b (patch) | |
| tree | 27c9e56492757576f43b584dca1790b435dbcb99 /test/testfolderman.cpp | |
| parent | 16e28567a63bf3ca9ac44de0e35833bb0db5c93e (diff) | |
| parent | 4998303c424d8ea050da30d2dd426a2472c8301b (diff) | |
Merge branch 'master' into dbjournal_per_account
Diffstat (limited to 'test/testfolderman.cpp')
| -rw-r--r-- | test/testfolderman.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/test/testfolderman.cpp b/test/testfolderman.cpp index 1d837d873..16dc81446 100644 --- a/test/testfolderman.cpp +++ b/test/testfolderman.cpp @@ -15,9 +15,9 @@ #include "folderman.h" #include "account.h" #include "accountstate.h" +#include "configfile.h" #include "creds/httpcredentials.h" - using namespace OCC; class HttpCredentialsTest : public HttpCredentials { @@ -51,6 +51,7 @@ private slots: { #if QT_VERSION >= QT_VERSION_CHECK(5, 1, 0) QTemporaryDir dir; + ConfigFile::setConfDir(dir.path()); // we don't want to pollute the user's config file QVERIFY(dir.isValid()); QDir dir2(dir.path()); QVERIFY(dir2.mkpath("sub/ownCloud1/folder/f")); |