wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
fixing directory seperators
This commit is contained in:
Thomas Müller 2014-09-23 07:38:23 +02:00
commit 37a5bff155
5 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/private/helper.php
View file

@ -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;
}
/**

6
tests/lib/cache/file.php vendored
View file

@ -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);
}
}

5
tests/lib/cache/usercache.php vendored
View file

@ -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);
}
}

3
tests/lib/config.php
View file

@ -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');
}

3
tests/lib/largefilehelpergetfilesize.php
View file

@ -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;
}