summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorRobin Appelman <icewind@owncloud.com>2015-10-12 17:21:54 +0200
committerJörn Friedrich Dreyer <jfd@butonic.de>2015-10-20 09:49:36 +0200
commit96feb6f05bf028621275835931dada57ceb9772e (patch)
tree12772d3fb9ae26a6777c855f7ea3c95cb8497926 /apps
parentbe9e72084d15a2496035b18afeafd9d0c0302f03 (diff)
downloadnextcloud-server-96feb6f05bf028621275835931dada57ceb9772e.tar.gz
nextcloud-server-96feb6f05bf028621275835931dada57ceb9772e.zip
fix sabre connector tests when using a non local home storage
Diffstat (limited to 'apps')
-rw-r--r--apps/files_sharing/tests/sharedstorage.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index de510cf1eec..de36d6dbd42 100644
--- a/apps/files_sharing/tests/sharedstorage.php
+++ b/apps/files_sharing/tests/sharedstorage.php
@@ -47,8 +47,10 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
}
protected function tearDown() {
- $this->view->unlink($this->folder);
- $this->view->unlink($this->filename);
+ if ($this->view) {
+ $this->view->unlink($this->folder);
+ $this->view->unlink($this->filename);
+ }
\OC\Files\Filesystem::getLoader()->removeStorageWrapper('oc_trashbin');
@@ -85,6 +87,7 @@ class Test_Files_Sharing_Storage extends OCA\Files_sharing\Tests\TestCase {
$this->assertFalse($user2View->is_dir($this->folder));
// delete the local folder
+// list($storage, $internalPa)
$fullPath = \OC_Config::getValue('datadirectory') . '/' . self::TEST_FILES_SHARING_API_USER2 . '/files/localfolder';
rmdir($fullPath);