[Pkg-owncloud-commits] [owncloud] 30/74: Fix Files\Storage\Home::testRoot()

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit a19fd8880d04eb6462c79acd2bbfabe07ce6526b
Author: Joas Schilling <nickvergessen at gmx.de>
Date:   Mon Nov 10 11:38:14 2014 +0100

    Fix Files\Storage\Home::testRoot()
---
 tests/lib/files/storage/home.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php
index 51315a2..6149213 100644
--- a/tests/lib/files/storage/home.php
+++ b/tests/lib/files/storage/home.php
@@ -73,7 +73,12 @@ class Home extends Storage {
 	 * Tests that the root path matches the data dir
 	 */
 	public function testRoot() {
-		$this->assertEquals($this->tmpDir, $this->instance->getLocalFolder(''));
+		if (\OC_Util::runningOnWindows()) {
+			// Windows removes trailing slashes when returning paths
+			$this->assertEquals(rtrim($this->tmpDir, '/'), $this->instance->getLocalFolder(''));
+		} else {
+			$this->assertEquals($this->tmpDir, $this->instance->getLocalFolder(''));
+		}
 	}
 
 	/**

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