From 7c2b9ffcf6b509c2f7bcc7a595bd6210be12de9d Mon Sep 17 00:00:00 2001 From: Jun Pataleta Date: Thu, 24 Jan 2019 12:50:14 +0800 Subject: [PATCH] MDL-64597 behat: Properly import behat_util when dropping parallel sites --- admin/tool/behat/cli/util.php | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/admin/tool/behat/cli/util.php b/admin/tool/behat/cli/util.php index e88125bbcb5..83a19af1b63 100644 --- a/admin/tool/behat/cli/util.php +++ b/admin/tool/behat/cli/util.php @@ -109,6 +109,17 @@ require_once(__DIR__ . '/../../../../lib/behat/lib.php'); require_once(__DIR__ . '/../../../../lib/behat/classes/behat_command.php'); require_once(__DIR__ . '/../../../../lib/behat/classes/behat_config_manager.php'); +// Remove error handling overrides done in config.php. This is consistent with admin/tool/behat/cli/util_single_run.php. +$CFG->debug = (E_ALL | E_STRICT); +$CFG->debugdisplay = 1; +error_reporting($CFG->debug); +ini_set('display_errors', '1'); +ini_set('log_errors', '1'); + +// Import the necessary libraries. +require_once($CFG->libdir . '/setuplib.php'); +require_once($CFG->libdir . '/behat/classes/util.php'); + // For drop option check if parallel site. if ((empty($options['parallel'])) && ($options['drop']) || $options['updatesteps']) { $options['parallel'] = behat_config_manager::get_behat_run_config_value('parallel');