From: Aaron Schulz <aschulz@wikimedia.org>
Date: Wed, 21 Oct 2015 19:13:22 +0000 (-0700)
Subject: Fix transaction warnings on test cleanup rollback()
X-Git-Tag: 1.31.0-rc.0~9308^2
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=dfa8006f6872a0364a8353a91e2ec50b92577919;p=lhc%2Fweb%2Fwiklou.git

Fix transaction warnings on test cleanup rollback()

Change-Id: I85f607c7562474d57f515a947181884fccae735c
---

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' );
 			}
 		}