From dfa8006f6872a0364a8353a91e2ec50b92577919 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 21 Oct 2015 12:13:22 -0700 Subject: [PATCH] Fix transaction warnings on test cleanup rollback() Change-Id: I85f607c7562474d57f515a947181884fccae735c --- tests/phpunit/MediaWikiTestCase.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php index 8af142811f..9e4a984653 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -207,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' ); } } @@ -241,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' ); } } -- 2.20.1