MDL-32323 improve self-diagnostic messages

moodle · Apr 10, 2012 · 219d1a4 · 219d1a4
1 parent 8b5413c
commit 219d1a4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/lib/phpunit/bootstraplib.php b/lib/phpunit/bootstraplib.php
@@ -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;

diff --git a/lib/phpunit/lib.php b/lib/phpunit/lib.php
@@ -564,7 +564,7 @@ public static function drop_site() {
         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 @@ public static function install_site() {
         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();