Merge "Fully log exceptions within ResourceLoader (including traces)"

[lhc/web/wiklou.git] / tests / parser / parserTest.inc

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 3ca28c6..f08e995 100644 (file)
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -260,7 +260,7 @@ class ParserTest {
                                        'iw_wikiid' => '',
                                        'iw_local' => 1 ),
                        );
-                       if( array_key_exists( $prefix, $testInterwikis ) ) {
+                       if ( array_key_exists( $prefix, $testInterwikis ) ) {
                                $iwData = $testInterwikis[$prefix];
                        }
 
@@ -269,6 +269,13 @@ class ParserTest {
                } );// hooks::register
        }
 
+       /**
+        * Remove the hardcoded interwiki lookup table.
+        */
+       public static function tearDownInterwikis() {
+               Hooks::clear( 'InterwikiLoadPrefix' );
+       }
+
        public function setupRecorder( $options ) {
                if ( isset( $options['record'] ) ) {
                        $this->recorder = new DbTestRecorder( $this );
@@ -434,7 +441,12 @@ class ParserTest {
         */
        public function runTestsFromFiles( $filenames ) {
                $ok = false;
+
+               // be sure, ParserTest::addArticle has correct language set,
+               // so that system messages gets into the right language cache
+               $GLOBALS['wgLanguageCode'] = 'en';
                $GLOBALS['wgContLang'] = Language::factory( 'en' );
+
                $this->recorder->start();
                try {
                        $this->setupDatabase();
@@ -1435,7 +1447,7 @@ class ParserTest {
        }
 
        static function getFakeTimestamp( &$parser, &$ts ) {
-               $ts = 123;
+               $ts = 123; //parsed as '1970-01-01T00:02:03Z'
                return true;
        }
 }