Index: trunk/phase3/tests/parser/parserTest.inc |
— | — | @@ -136,7 +136,8 @@ |
137 | 137 | $wgUser, $wgLang, $wgOut, $wgRequest, $wgStyleDirectory, $wgEnableParserCache, |
138 | 138 | $wgNamespaceAliases, $wgNamespaceProtection, $wgLocalFileRepo, |
139 | 139 | $parserMemc, $wgThumbnailScriptPath, $wgScriptPath, |
140 | | - $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath; |
| 140 | + $wgArticlePath, $wgStyleSheetPath, $wgScript, $wgStylePath, $wgExtensionAssetsPath, |
| 141 | + $wgMainCacheType, $wgMessageCacheType, $wgParserCacheType; |
141 | 142 | |
142 | 143 | $wgScript = '/index.php'; |
143 | 144 | $wgScriptPath = '/'; |
— | — | @@ -158,10 +159,20 @@ |
159 | 160 | $wgNamespaceAliases['Image'] = NS_FILE; |
160 | 161 | $wgNamespaceAliases['Image_talk'] = NS_FILE_TALK; |
161 | 162 | |
| 163 | + // XXX: tests won't run without this (for CACHE_DB) |
| 164 | + if ( $wgMainCacheType === CACHE_DB ) { |
| 165 | + $wgMainCacheType = CACHE_NONE; |
| 166 | + } |
| 167 | + if ( $wgMessageCacheType === CACHE_DB ) { |
| 168 | + $wgMessageCacheType = CACHE_NONE; |
| 169 | + } |
| 170 | + if ( $wgParserCacheType === CACHE_DB ) { |
| 171 | + $wgParserCacheType = CACHE_NONE; |
| 172 | + } |
162 | 173 | |
163 | 174 | $wgEnableParserCache = false; |
164 | 175 | DeferredUpdates::clearPendingUpdates(); |
165 | | - $wgMemc = wfGetMainCache(); |
| 176 | + $wgMemc = wfGetMainCache(); // checks $wgMainCacheType |
166 | 177 | $messageMemc = wfGetMessageCacheStorage(); |
167 | 178 | $parserMemc = wfGetParserCacheStorage(); |
168 | 179 | |