moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-52913_master' of git://github.com/marxjohnson/moodle

Browse source
This commit is contained in:
David Monllao 2016-02-01 13:46:18 +08:00
commit cd55c6e249
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/tests/behat/behat_hooks.php
View file

@ -375,13 +375,22 @@ class behat_hooks extends behat_base {
* @AfterStep * @AfterStep
*/ */
public function after_step(StepEvent $event) { public function after_step(StepEvent $event) {
global $CFG; global $CFG, $DB;
// Save the page content if the step failed. // Save the page content if the step failed.
if (!empty($CFG->behat_faildump_path) && if (!empty($CFG->behat_faildump_path) &&
$event->getResult() === StepEvent::FAILED) { $event->getResult() === StepEvent::FAILED) {
$this->take_contentdump($event); $this->take_contentdump($event);
} }
// Abort any open transactions to prevent subsequent tests hanging.
// This does the same as abort_all_db_transactions(), but doesn't call error_log() as we don't
// want to see a message in the behat output.
if ($event->hasException()) {
if ($DB && $DB->is_transaction_started()) {
$DB->force_transaction_rollback();
}
}
} }
/** /**