Revert global removals in test/ from r77393

diff --git a/maintenance/tests/parser/parserTest.inc b/maintenance/tests/parser/parserTest.inc
index 3ce0f5a..0d0a891 100644 (file)
--- a/maintenance/tests/parser/parserTest.inc
+++ b/maintenance/tests/parser/parserTest.inc
@@ -120,9 +120,9 @@ class ParserTest {
        }
 
        static function setUp() {
-               global $wgParser,  $wgParserConf, $IP, $wgDeferredUpdateList,
+               global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
                        $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
-                       $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry,
+                       $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
                        $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
                        $wgThumbnailScriptPath, $wgScriptPath,
                        $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;

diff --git a/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php b/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
index b3063a1..6629369 100644 (file)
--- a/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
+++ b/maintenance/tests/phpunit/suites/UploadFromUrlTestSuite.php
@@ -14,9 +14,9 @@ class UploadFromUrlTestSuite extends PHPUnit_Framework_TestSuite {
        }
 
        function setUp() {
-               global $wgParser, $wgParserConf, $IP, $wgDeferredUpdateList,
+               global $wgParser, $wgParserConf, $IP, $messageMemc, $wgMemc, $wgDeferredUpdateList,
                                  $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache,
-                                 $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry,
+                                 $wgMessageCache, $wgUseDatabaseMessages, $wgMsgCacheExpiry, $parserMemc,
                                  $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo,
                                  $wgThumbnailScriptPath, $wgScriptPath,
                                  $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath;