summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorThomas Müller <thomas.mueller@tmit.eu>2016-01-18 16:57:30 +0100
committerThomas Müller <thomas.mueller@tmit.eu>2016-01-18 16:57:30 +0100
commit14c98b4df78a489cfdf4656cb66a79a13116ac17 (patch)
treeed48eff319ae53b2e94fca8e5ff518536b715068 /tests
parenta32f8aa87a959bf0050cbd7f710a690427f5a1f2 (diff)
parent30d6222e64e14d589f2ab8b8ef2ec015fc7e1bd5 (diff)
downloadnextcloud-server-14c98b4df78a489cfdf4656cb66a79a13116ac17.tar.gz
nextcloud-server-14c98b4df78a489cfdf4656cb66a79a13116ac17.zip
Merge pull request #21519 from owncloud/propagate-folder-size
propagate folder size in the same query for write updates
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/cache/file.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 0880e7e1282..92b784bf8ea 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -87,7 +87,9 @@ class FileCache extends \Test_Cache {
}
protected function tearDown() {
- $this->instance->remove('hack', 'hack');
+ if ($this->instance) {
+ $this->instance->remove('hack', 'hack');
+ }
\OC_User::setUserId($this->user);
\OC::$server->getConfig()->setSystemValue('cachedirectory', $this->datadir);