From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 27 Jun 2017 22:08:39 +0000 (+0000)
Subject: Merge "tests: Reset LanguageConverter conversion tables between test cases"
X-Git-Tag: 1.31.0-rc.0~2873
X-Git-Url: https://git.cyclocoop.org/%7B%24admin_url%7Dmembres/cotisations/rappels.php?a=commitdiff_plain;h=6b604178acc9beecd2abc638043c9067043efc12;hp=d7907e728a0729c2c9623e15b195db26f3bd7f11;p=lhc%2Fweb%2Fwiklou.git

Merge "tests: Reset LanguageConverter conversion tables between test cases"
---

diff --git a/languages/FakeConverter.php b/languages/FakeConverter.php
index 0cddc9957e..0bf88c6319 100644
--- a/languages/FakeConverter.php
+++ b/languages/FakeConverter.php
@@ -125,4 +125,7 @@ class FakeConverter {
 
 	public function updateConversionTable( Title $title ) {
 	}
+
+	public function reloadTables() {
+	}
 }
diff --git a/languages/LanguageConverter.php b/languages/LanguageConverter.php
index 19d644c57e..ef88c123eb 100644
--- a/languages/LanguageConverter.php
+++ b/languages/LanguageConverter.php
@@ -891,7 +891,9 @@ class LanguageConverter {
 	/**
 	 * Reload the conversion tables.
 	 *
-	 * @private
+	 * Public only for use by test suites which need to reset the converter
+	 * state.
+	 *
 	 */
 	function reloadTables() {
 		if ( $this->mTables ) {
diff --git a/tests/parser/ParserTestRunner.php b/tests/parser/ParserTestRunner.php
index 3ae3561e68..6d5910dd79 100644
--- a/tests/parser/ParserTestRunner.php
+++ b/tests/parser/ParserTestRunner.php
@@ -1045,6 +1045,8 @@ class ParserTestRunner {
 		$context->setUser( $user );
 		$context->setLanguage( $lang );
 		$teardown[] = function () use ( $context ) {
+			// Clear language conversion tables
+			$context->getLanguage()->getConverter()->reloadTables();
 			// Reset context to the restored globals
 			$context->setUser( $GLOBALS['wgUser'] );
 			$context->setLanguage( $GLOBALS['wgContLang'] );