From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 9 Apr 2019 15:17:45 +0000 (+0000)
Subject: Merge "MediaWikiTestCase: Fix schema restoration"
X-Git-Tag: 1.34.0-rc.0~2085
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22suivi_revisions%22%2C%22id_auteur=%24connecte%22%29%20.%20%22?a=commitdiff_plain;h=3f134f0834d530107ab9b7a76edac934521bb8ad;hp=fcef0f1cea44deaf4de89580b22a4dfbd8c63f37;p=lhc%2Fweb%2Fwiklou.git

Merge "MediaWikiTestCase: Fix schema restoration"
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 8a38f42b41..f1bb632300 100644
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -1616,6 +1616,10 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
 
 		if ( $tablesToRestore ) {
 			$this->recloneMockTables( $db, $tablesToRestore );
+
+			// Reset the restored tables, mainly for the side effect of
+			// re-calling $this->addCoreDBData() if necessary.
+			$this->resetDB( $db, $tablesToRestore );
 		}
 	}
 
@@ -1630,6 +1634,7 @@ abstract class MediaWikiTestCase extends PHPUnit\Framework\TestCase {
 
 		if ( $oldOverrides['alter'] || $oldOverrides['create'] || $oldOverrides['drop'] ) {
 			$this->undoSchemaOverrides( $db, $oldOverrides );
+			unset( $db->_schemaOverrides );
 		}
 
 		// Determine new overrides.