X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2FMediaWikiTestCase.php;h=9e4a98465330584b9ba68cd47df377e5ec39d851;hb=2905943e54dfc9067dbb332b054e32eef72088f2;hp=90d40a5ddd2aefdc34218ea88620183c3ff7b390;hpb=3d0b4fea3dfb94610be0f0e9d8ff1cb24f106707;p=lhc%2Fweb%2Fwiklou.git diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index 90d40a5ddd..9e4a984653 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -181,7 +181,6 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { $fileName = $this->getNewTempFile(); // Converting the temporary /file/ to a /directory/ - // // The following is not atomic, but at least we now have a single place, // where temporary directory creation is bundled and can be improved unlink( $fileName ); @@ -208,7 +207,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { if ( $this->needsDB() && $this->db ) { // Clean up open transactions while ( $this->db->trxLevel() > 0 ) { - $this->db->rollback(); + $this->db->rollback( __METHOD__, 'flush' ); } } @@ -242,7 +241,7 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { if ( $this->needsDB() && $this->db ) { // Clean up open transactions while ( $this->db->trxLevel() > 0 ) { - $this->db->rollback(); + $this->db->rollback( __METHOD__, 'flush' ); } }