diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-23 07:38:23 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2014-09-23 07:38:23 +0200 |
| commit | 37a5bff1552ce672abfb15ffc0ba0c2468fdd058 (patch) | |
| tree | 2d7999e3ed61806c3a54ba7253f91d4f49ae3c8e /tests | |
| parent | b3f1216ae0d43e228c8374453fc3aa1fe5e585b3 (diff) | |
| parent | 59a5df6a4bb81b0350090fc5f28677d239910379 (diff) | |
| download | nextcloud-server-37a5bff1552ce672abfb15ffc0ba0c2468fdd058.tar.gz nextcloud-server-37a5bff1552ce672abfb15ffc0ba0c2468fdd058.zip | |
Merge pull request #11227 from owncloud/fix-windows-path
fixing directory seperators
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lib/cache/file.php | 6 | ||||
| -rw-r--r-- | tests/lib/cache/usercache.php | 5 | ||||
| -rw-r--r-- | tests/lib/config.php | 3 | ||||
| -rw-r--r-- | tests/lib/largefilehelpergetfilesize.php | 3 |
4 files changed, 10 insertions, 7 deletions
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; } |