mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "fix failing master branch - Test_Config::testWriteData" 

This reverts commit 8f93490ac4.
This commit is contained in:
Bart Visscher 2013-07-23 17:36:08 +02:00
parent 6ddad8dc49
commit 5caa7576d4
2 changed files with 1 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/config.php
View File

@ -144,11 +144,7 @@ class Config {
continue;
}
unset($CONFIG);
if((@include $file) === false)
{
throw new HintException("Can't read from config file '" . $file . "'. ".
'This is usually caused by the wrong file permission.');
}
include $file;
if (isset($CONFIG) && is_array($CONFIG)) {
$this->cache = array_merge($this->cache, $CONFIG);
}

11
tests/lib/config.php
View File

@ -80,17 +80,6 @@ class Test_Config extends PHPUnit_Framework_TestCase {
*/
public function testWriteData() {
$config = new OC\Config('/non-writable');
// TODO never get's called, because the previous call throws the exception
// maybe include some more logic to create a readable dir and then try to
// write to this dir
//
// console commands:
// $ sudo touch /non-writableconfig.php
// $ sudo chmod go-rwx /non-writableconfig.php
// ---- call the tests now -> above statemant throws the exception
//
// $ sudo chmod go+r /non-writableconfig.php
// ---- call the tests now -> bellow statemant throws the exception
$config->setValue('foo', 'bar');
}
}