summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-10 11:38:14 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-17 10:48:16 +0100
commit53318c4bb5910ee27daa3e8ffe8f6b253d40a042 (patch)
treea69d6cdeb3cfabbb84874c47fd50f82c4021834f /tests
parent0ab973a3a6ba9c0c98f7414fa620c72bc356e286 (diff)
downloadnextcloud-server-53318c4bb5910ee27daa3e8ffe8f6b253d40a042.tar.gz
nextcloud-server-53318c4bb5910ee27daa3e8ffe8f6b253d40a042.zip
Fix Files\Storage\Home::testRoot()
Diffstat (limited to 'tests')
-rw-r--r--tests/lib/files/storage/home.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/tests/lib/files/storage/home.php b/tests/lib/files/storage/home.php
index 953fcfc8a6a..d085efe9c1c 100644
--- a/tests/lib/files/storage/home.php
+++ b/tests/lib/files/storage/home.php
@@ -75,7 +75,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(''));
+ }
}
/**