mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

MDL-32323 improve self-diagnostic messages

Browse Source
This commit is contained in:
Petr Skoda 2012-04-07 14:00:44 +02:00
parent 8b5413ccf2
commit 219d1a4e72
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/phpunit/bootstraplib.php
View File

@ -33,6 +33,9 @@
*/
function phpunit_bootstrap_error($errorcode, $text = '') {
switch ($errorcode) {
case 0:
// this is not an error, just print information and exit
break;
case 1:
$text = 'Error: '.$text;
break;

11
lib/phpunit/lib.php
View File

@ -564,7 +564,7 @@ class phpunit_util {
global $DB, $CFG;
if (!self::is_test_site()) {
cli_error('Can not drop non-test sites!!', 131);
phpunit_bootstrap_error(131, 'Can not drop non-test site!!');
}
// purge dataroot
@ -609,11 +609,16 @@ class phpunit_util {
global $DB, $CFG;
if (!self::is_test_site()) {
cli_error('Can not install non-test sites!!', 131);
phpunit_bootstrap_error(131, 'Can not install on non-test site!!');
}
if ($DB->get_tables()) {
cli_error('Database tables already installed, drop the site first.', 133);
list($errorcode, $message) = phpunit_util::testing_ready_problem();
if ($errorcode) {
phpunit_bootstrap_error(133, 'Database tables already installed, drop the site first.');
} else {
phpunit_bootstrap_error(0, 'Test database is already initialised');
}
}
$options = array();