From 181dc242ea9c1b492d4e4b25f2f664f5a8fef737 Mon Sep 17 00:00:00 2001 From: addshore Date: Mon, 20 Nov 2017 09:33:28 +0000 Subject: [PATCH] Set wgCommentTableSchemaMigrationStage for some RevisionTests Bug: T180922 Change-Id: Ib88b53e36a66042b3c177cae0663040b4fb14a4c --- tests/phpunit/includes/RevisionTest.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/phpunit/includes/RevisionTest.php b/tests/phpunit/includes/RevisionTest.php index 6965f09db4..d933d9309d 100644 --- a/tests/phpunit/includes/RevisionTest.php +++ b/tests/phpunit/includes/RevisionTest.php @@ -372,6 +372,7 @@ class RevisionTest extends MediaWikiTestCase { * @covers Revision::fetchFromConds */ public function testFetchFromConds( $flags, array $options ) { + $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); $conditions = [ 'conditionsArray' ]; $db = $this->getMock( IDatabase::class ); @@ -650,6 +651,7 @@ class RevisionTest extends MediaWikiTestCase { public function testSelectFields( $contentHandlerUseDB, $expected ) { $this->hideDeprecated( 'Revision::selectFields' ); $this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB ); + $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); $this->assertEquals( $expected, Revision::selectFields() ); } @@ -708,6 +710,7 @@ class RevisionTest extends MediaWikiTestCase { public function testSelectArchiveFields( $contentHandlerUseDB, $expected ) { $this->hideDeprecated( 'Revision::selectArchiveFields' ); $this->setMwGlobals( 'wgContentHandlerUseDB', $contentHandlerUseDB ); + $this->setMwGlobals( 'wgCommentTableSchemaMigrationStage', MIGRATION_OLD ); $this->assertEquals( $expected, Revision::selectArchiveFields() ); } -- 2.20.1