[Pkg-owncloud-commits] [owncloud] 30/129: fix sabre connector tests when using a non local home storage

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit 96feb6f05bf028621275835931dada57ceb9772e
Author: Robin Appelman <icewind at owncloud.com>
Date:   Mon Oct 12 17:21:54 2015 +0200

    fix sabre connector tests when using a non local home storage
---
 apps/files_sharing/tests/sharedstorage.php |  7 +++++--
 tests/lib/connector/sabre/file.php         | 15 +++++++++------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/tests/sharedstorage.php b/apps/files_sharing/tests/sharedstorage.php
index de510cf..de36d6d 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);
 
diff --git a/tests/lib/connector/sabre/file.php b/tests/lib/connector/sabre/file.php
index fe4c5ec..2dc6278 100644
--- a/tests/lib/connector/sabre/file.php
+++ b/tests/lib/connector/sabre/file.php
@@ -8,6 +8,7 @@
 
 namespace Test\Connector\Sabre;
 
+use OC\Files\Storage\Local;
 use Test\HookHelper;
 use OC\Files\Filesystem;
 use OCP\Lock\ILockingProvider;
@@ -798,14 +799,16 @@ class File extends \Test\TestCase {
 		}
 		$files = [];
 		list($storage, $internalPath) = $userView->resolvePath($path);
-		$realPath = $storage->getSourcePath($internalPath);
-		$dh = opendir($realPath);
-		while (($file = readdir($dh)) !== false) {
-			if (substr($file, strlen($file) - 5, 5) === '.part') {
-				$files[] = $file;
+		if($storage instanceof Local) {
+			$realPath = $storage->getSourcePath($internalPath);
+			$dh = opendir($realPath);
+			while (($file = readdir($dh)) !== false) {
+				if (substr($file, strlen($file) - 5, 5) === '.part') {
+					$files[] = $file;
+				}
 			}
+			closedir($dh);
 		}
-		closedir($dh);
 		return $files;
 	}
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git