Merge pull request #3796 from owncloud/gracefully_handle_teardown_in_scanner_test

skip teardown if cache has not been set up

1 files changed, 6 insertions, 4 deletions

diff --git a/tests/lib/files/cache/scanner.php b/tests/lib/files/cache/scanner.php
index e93c51441b1..042bf8991f6 100644
--- a/tests/lib/files/cache/scanner.php
+++ b/tests/lib/files/cache/scanner.php
@@ -172,9 +172,11 @@ class Scanner extends \PHPUnit_Framework_TestCase {
 	}
 
 	function tearDown() {
-		$ids = $this->cache->getAll();
-		$permissionsCache = $this->storage->getPermissionsCache();
-		$permissionsCache->removeMultiple($ids, \OC_User::getUser());
-		$this->cache->clear();
+		if ($this->cache) {
+			$ids = $this->cache->getAll();
+			$permissionsCache = $this->storage->getPermissionsCache();
+			$permissionsCache->removeMultiple($ids, \OC_User::getUser());
+			$this->cache->clear();
+		}
 	}
 }