From 9d74ee8bd8afbaa60d797dd6c532bcf877c5540b Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Mon, 14 Mar 2016 22:49:13 -0400 Subject: [PATCH] Move dbSetup=true; follow-up d920237 See https://gerrit.wikimedia.org/r/#/c/274643/8/tests/phpunit/MediaWikiTestCase.php I unintentionally changed it so dbSetup wasn't always set to true (it was in the early return case in the old code, but not the new) Bug: T95870 Change-Id: I2119b0233330b88a61d15fe4dc55fe855fce4b6a --- 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 f3306beeb4..045c3d4bed 100644 --- a/tests/phpunit/MediaWikiTestCase.php +++ b/tests/phpunit/MediaWikiTestCase.php @@ -764,6 +764,8 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { return; } + self::$dbSetup = true; + if ( !self::setupDatabaseWithTestPrefix( $db, $prefix ) ) { return; } @@ -773,8 +775,6 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase { if ( $db->getType() == 'oracle' ) { $db->query( 'BEGIN FILL_WIKI_INFO; END;' ); } - - self::$dbSetup = true; } /** -- 2.20.1