From 3624259efb2b2801215d3260c06e00ca6aaf89e7 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Tue, 28 Aug 2018 09:39:18 +1000 Subject: [PATCH] Set migration stages in RevisionStoreDbTestBase I confirmed that wgCommentTableSchemaMigrationStage needs to be set, and getActorQueryFields() implies that the actor table migration stage needs to be set as well. Change-Id: I153ff985c8753b291d2201ebeed10515acb0cd36 --- .../includes/Storage/RevisionStoreDbTestBase.php | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php b/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php index 8137b274d9..667975458c 100644 --- a/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php +++ b/tests/phpunit/includes/Storage/RevisionStoreDbTestBase.php @@ -77,15 +77,12 @@ abstract class RevisionStoreDbTestBase extends MediaWikiTestCase { $this->tablesUsed += $this->getMcrTablesToReset(); - $this->setMwGlobals( - 'wgMultiContentRevisionSchemaMigrationStage', - $this->getMcrMigrationStage() - ); - - $this->setMwGlobals( - 'wgContentHandlerUseDB', - $this->getContentHandlerUseDB() - ); + $this->setMwGlobals( [ + 'wgMultiContentRevisionSchemaMigrationStage' => $this->getMcrMigrationStage(), + 'wgContentHandlerUseDB' => $this->getContentHandlerUseDB(), + 'wgCommentTableSchemaMigrationStage' => MIGRATION_OLD, + 'wgActorTableSchemaMigrationStage' => MIGRATION_OLD, + ] ); $this->overrideMwServices(); } -- 2.20.1