Merge pull request #11227 from owncloud/fix-windows-path

fixing directory seperators

5 files changed, 12 insertions, 9 deletions

diff --git a/lib/private/helper.php b/lib/private/helper.php
index f696b5a8900..1297d356d09 100644
--- a/lib/private/helper.php
+++ b/lib/private/helper.php
@@ -630,10 +630,10 @@ class OC_Helper {
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
 	public static function tmpFolder() {
-		$path = get_temp_dir() . '/' . md5(time() . rand());
+		$path = get_temp_dir() . DIRECTORY_SEPARATOR . md5(time() . rand());
 		mkdir($path);
 		self::$tmpFiles[] = $path;
-		return $path . '/';
+		return $path . DIRECTORY_SEPARATOR;
 	}
 
 	/**
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 3767c83fcb1..0e19c105cd1 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -46,8 +46,8 @@ class FileCache extends \Test_Cache {
 		$storage = new \OC\Files\Storage\Temporary(array());
 		\OC\Files\Filesystem::mount($storage,array(),'/');
 		$datadir = str_replace('local::', '', $storage->getId());
-		$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
-		\OC_Config::setValue('datadirectory', $datadir);
+		$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
+		\OC_Config::setValue('cachedirectory', $datadir);
 
 		\OC_User::clearBackends();
 		\OC_User::useBackend(new \OC_User_Dummy());
@@ -67,6 +67,6 @@ class FileCache extends \Test_Cache {
 
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
-		\OC_Config::setValue('datadirectory', $this->datadir);
+		\OC_Config::setValue('cachedirectory', $this->datadir);
 	}
 }
diff --git a/tests/lib/cache/usercache.php b/tests/lib/cache/usercache.php
index 21b7f848ab6..a1b6af1c55d 100644
--- a/tests/lib/cache/usercache.php
+++ b/tests/lib/cache/usercache.php
@@ -42,8 +42,8 @@ class UserCache extends \Test_Cache {
 		$storage = new \OC\Files\Storage\Temporary(array());
 		\OC\Files\Filesystem::mount($storage,array(),'/');
 		$datadir = str_replace('local::', '', $storage->getId());
-		$this->datadir = \OC_Config::getValue('datadirectory', \OC::$SERVERROOT.'/data');
-		\OC_Config::setValue('datadirectory', $datadir);
+		$this->datadir = \OC_Config::getValue('cachedirectory', \OC::$SERVERROOT.'/data/cache');
+		\OC_Config::setValue('cachedirectory', $datadir);
 
 		\OC_User::clearBackends();
 		\OC_User::useBackend(new \OC_User_Dummy());
@@ -63,6 +63,5 @@ class UserCache extends \Test_Cache {
 
 	public function tearDown() {
 		\OC_User::setUserId($this->user);
-		\OC_Config::setValue('datadirectory', $this->datadir);
 	}
 }
diff --git a/tests/lib/config.php b/tests/lib/config.php
index c67a66c832e..f739df3ce97 100644
--- a/tests/lib/config.php
+++ b/tests/lib/config.php
@@ -79,6 +79,9 @@ class Test_Config extends PHPUnit_Framework_TestCase {
 	 * @expectedException \OC\HintException
 	 */
 	public function testWriteData() {
+		if (\OC_Util::runningOnWindows()) {
+			throw new \OC\HintException('this is ireelevent for windows');
+		}
 		$config = new OC\Config('/non-writable');
 		$config->setValue('foo', 'bar');
 	}
diff --git a/tests/lib/largefilehelpergetfilesize.php b/tests/lib/largefilehelpergetfilesize.php
index 86ce6d295cf..21a0aa9a233 100644
--- a/tests/lib/largefilehelpergetfilesize.php
+++ b/tests/lib/largefilehelpergetfilesize.php
@@ -19,7 +19,8 @@ class LargeFileHelperGetFileSize extends \PHPUnit_Framework_TestCase {
 
 	public function setUp() {
 		parent::setUp();
-		$this->filename = __DIR__ . '/../data/data.tar.gz';
+		$ds = DIRECTORY_SEPARATOR;
+		$this->filename = dirname(__DIR__) . "{$ds}data{$ds}data.tar.gz";
 		$this->fileSize = 4195;
 		$this->helper = new \OC\LargeFileHelper;
 	}