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

Fixing unit test execution

Browse source
This commit is contained in:
Thomas Müller 2015-07-03 15:02:51 +02:00
parent 1385b1ec48
commit 403deb2a33
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/public/util.php
View file

@ -78,7 +78,7 @@ class Util {
public static function setChannel($channel) {
//Flush timestamp to reload version.php
\OC::$server->getSession()->set('OC_Version_Timestamp', 0);
return \OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel);
\OC::$server->getAppConfig()->setValue('core', 'OC_Channel', $channel);
}
/**
@ -148,8 +148,8 @@ class Util {
* @since 4.0.0
*/
public static function writeLog( $app, $message, $level ) {
// call the internal log class
\OCP\Util::writeLog( $app, $message, $level );
$context = ['app' => $app];
\OC::$server->getLogger()->log($level, $message, $context);
}
/**

1
tests/bootstrap.php
View file

@ -17,4 +17,3 @@ if (!class_exists('PHPUnit_Framework_TestCase')) {
}
OC_Hook::clear();
\OCP\Util::$enabled = false;