WebSVN – Moodle – Diff – /lib/behat/lib.php

         case E_USER_WARNING:
             $errnostr = 'Warning';
             break;
         case E_NOTICE:
         case E_USER_NOTICE:
-        case E_STRICT:
             $errnostr = 'Notice';
             break;
         case E_RECOVERABLE_ERROR:
             $errnostr = 'Catchable';
             break;
     // If is preceded by an @ we don't show it.
     if (!error_reporting()) {
         return true;
+    }
-    // This error handler receives E_ALL | E_STRICT, running the behat test site the debug level is
+    // This error handler receives E_ALL, running the behat test site the debug level is
     // set to DEVELOPER and will always include E_NOTICE,E_USER_NOTICE... as part of E_ALL, if the current
     // error_reporting() value does not include one of those levels is because it has been forced through
     // the moodle code (see fix_utf8() for example) in that cases we respect the forced error level value.
-    $respect = array(E_NOTICE, E_USER_NOTICE, E_STRICT, E_WARNING, E_USER_WARNING, E_DEPRECATED, E_USER_DEPRECATED);
+    $respect = [E_NOTICE, E_USER_NOTICE, E_WARNING, E_USER_WARNING, E_DEPRECATED, E_USER_DEPRECATED];
     foreach ($respect as $respectable) {
         // If the current value does not include this kind of errors and the reported error is
     $allowed = array_flip(array(
         'wwwroot', 'dataroot', 'dirroot', 'admin', 'directorypermissions', 'filepermissions',
         'umaskpermissions', 'dbtype', 'dblibrary', 'dbhost', 'dbname', 'dbuser', 'dbpass', 'prefix',
         'dboptions', 'proxyhost', 'proxyport', 'proxytype', 'proxyuser', 'proxypassword',
         'proxybypass', 'pathtogs', 'pathtophp', 'pathtodu', 'aspellpath', 'pathtodot', 'skiplangupgrade',
-        'altcacheconfigpath', 'pathtounoconv', 'alternative_file_system_class', 'pathtopython'
+        'altcacheconfigpath', 'pathtounoconv', 'alternative_file_system_class', 'pathtopython',
+        'routerconfigured',
     ));
     // Add extra allowed settings.
     if (!empty($CFG->behat_extraallowedsettings)) {
     foreach ($CFG as $key => $value) {
         if (!isset($allowed[$key]) && strpos($key, 'behat_') !== 0) {
             unset($CFG->{$key});
+        }
+    }
+    // Allow email catcher settings.
+    if (defined('TEST_EMAILCATCHER_MAIL_SERVER')) {
+        $CFG->noemailever = false;
+        $CFG->smtphosts = TEST_EMAILCATCHER_MAIL_SERVER;
+    }
+}
 /**
  * Checks that the behat config vars are properly set.
         return true;
+    }
     if (empty($CFG->behat_wwwroot)) {
         return false;
+    }
+    if (defined('CLI_SCRIPT') && CLI_SCRIPT && getenv('BEHAT_CLI')) {
+        // Environment variable makes CLI script run on Behat instance.
+        echo "BEHAT_CLI: This command line script is running on the acceptance testing site.\n\n";
+        return true;
+    }
     if (isset($_SERVER['REMOTE_ADDR']) and behat_is_requested_url($CFG->behat_wwwroot)) {
         // Something is accessing the web server like a real browser.
         return true;
+    }
 /**
  * Fix variables for parallel behat testing.
  * - behat_wwwroot = behat_wwwroot{behatrunprocess}
  * - behat_dataroot = behat_dataroot{behatrunprocess}
- * - behat_prefix = behat_prefix.{behatrunprocess}_ (For oracle it will be firstletter of prefix and behatrunprocess)
+ * - behat_prefix = behat_prefix.{behatrunprocess}
  **/
 function behat_update_vars_for_process() {
     global $CFG;
                 $CFG->behat_dataroot .= $behatrunprocess;
+            }
+        }
-        // Set behat_prefix for db, just suffix run process number, to avoid max length exceed.
-        // For oracle only 2 letter prefix is possible.
+        // Set behat_prefix for db, just suffix run process number, to avoid max length exceed.
-        // NOTE: This will not work for parallel process > 9.
-        if ($CFG->dbtype === 'oci') {
-            $CFG->behat_prefix = substr($CFG->behat_prefix, 0, 1);
-            $CFG->behat_prefix .= "{$behatrunprocess}";
-        } else {
+        // NOTE: This will not work for parallel process > 9.
-            $CFG->behat_prefix .= "{$behatrunprocess}_";
         $CFG->behat_prefix .= "{$behatrunprocess}_";
         if (!empty($CFG->behat_parallel_run[$behatrunprocess - 1])) {
             // Override allowed config vars.

Proyectos de Subversion Moodle

(root)/lib/behat/lib.php – Rev 1 → 1441