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 reset state after failed test

Browse Source
This commit is contained in:
Petr Skoda 2012-04-09 13:51:50 +02:00
parent 9bb2b515ce
commit 713d20918f
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/phpunit/lib.php
View File

@ -983,7 +983,13 @@ class basic_testcase extends PHPUnit_Framework_TestCase {
public function runBare() {
global $DB;
parent::runBare();
try {
parent::runBare();
} catch (Exception $e) {
// cleanup after failed expectation
phpunit_util::reset_all_data();
throw $e;
}
if ($DB->is_transaction_started()) {
$DB->force_transaction_rollback();
@ -1044,7 +1050,16 @@ class advanced_testcase extends PHPUnit_Framework_TestCase {
$this->testdbtransaction = $DB->start_delegated_transaction();
}
parent::runBare();
try {
parent::runBare();
} catch (Exception $e) {
// cleanup after failed expectation
if ($DB->is_transaction_started()) {
$DB->force_transaction_rollback();
}
phpunit_util::reset_all_data();
throw $e;
}
if (!$this->testdbtransaction or $this->testdbtransaction->is_disposed()) {
$this->testdbtransaction = null;