http://www.mediawiki.org/wiki/Special:Code/MediaWiki/61775
Revision: 61775
Author: mah
Date: 2010-02-01 04:55:15 +0000 (Mon, 01 Feb 2010)
Log Message:
-----------
Fix parsertests so that they work even when server-side thumbnailing isn't
configured.
Modified Paths:
--------------
trunk/phase3/includes/MessageCache.php
trunk/phase3/includes/Namespace.php
trunk/phase3/includes/Title.php
trunk/phase3/maintenance/parserTests.inc
trunk/phase3/maintenance/parserTests.txt
trunk/phase3/tests/MediaWikiParserTest.php
trunk/phase3/tests/MediaWiki_TestCase.php
Modified: trunk/phase3/includes/MessageCache.php
===================================================================
--- trunk/phase3/includes/MessageCache.php 2010-02-01 03:18:58 UTC (rev
61774)
+++ trunk/phase3/includes/MessageCache.php 2010-02-01 04:55:15 UTC (rev
61775)
@@ -399,16 +399,18 @@
// Also delete cached sidebar... just in case it is affected
global $parserMemc;
- $codes = array( $code );
- if ( $code === 'en' ) {
- // Delete all sidebars, like for example on
action=purge on the
- // sidebar messages
- $codes = array_keys( Language::getLanguageNames() );
- }
+ if(is_object($parserMemc)) {
+ $codes = array( $code );
+ if ( $code === 'en' ) {
+ // Delete all sidebars, like for example on
action=purge on the
+ // sidebar messages
+ $codes = array_keys(
Language::getLanguageNames() );
+ }
- foreach ( $codes as $code ) {
- $sidebarKey = wfMemcKey( 'sidebar', $code );
- $parserMemc->delete( $sidebarKey );
+ foreach ( $codes as $code ) {
+ $sidebarKey = wfMemcKey( 'sidebar', $code );
+ $parserMemc->delete( $sidebarKey );
+ }
}
wfRunHooks( "MessageCacheReplace", array( $title, $text ) );
Modified: trunk/phase3/includes/Namespace.php
===================================================================
--- trunk/phase3/includes/Namespace.php 2010-02-01 03:18:58 UTC (rev 61774)
+++ trunk/phase3/includes/Namespace.php 2010-02-01 04:55:15 UTC (rev 61775)
@@ -8,6 +8,7 @@
* Definitions of the NS_ constants are in Defines.php
* @private
*/
+global $wgCanonicalNamespaceNames;
$wgCanonicalNamespaceNames = array(
NS_MEDIA => 'Media',
NS_SPECIAL => 'Special',
Modified: trunk/phase3/includes/Title.php
===================================================================
--- trunk/phase3/includes/Title.php 2010-02-01 03:18:58 UTC (rev 61774)
+++ trunk/phase3/includes/Title.php 2010-02-01 04:55:15 UTC (rev 61775)
@@ -3451,7 +3451,12 @@
* @return \type{\string} String representation of this title
*/
public function __toString() {
- return $this->getPrefixedText();
+ $bt = debug_backtrace();
+ foreach($bt as $b) {
+ print "{$b['file']}:{$b['line']}\n";
+ }
+ exit;
+ return $this->getPrefixedText();
}
/**
Modified: trunk/phase3/maintenance/parserTests.inc
===================================================================
--- trunk/phase3/maintenance/parserTests.inc 2010-02-01 03:18:58 UTC (rev
61774)
+++ trunk/phase3/maintenance/parserTests.inc 2010-02-01 04:55:15 UTC (rev
61775)
@@ -640,6 +640,7 @@
'wgNoFollowLinks' => true,
'wgNoFollowDomainExceptions' => array(),
'wgThumbnailScriptPath' => false,
+ 'wgUseImageResize' => false,
'wgUseTeX' => false,
'wgLocaltimezone' => 'UTC',
'wgAllowExternalImages' => true,
Modified: trunk/phase3/maintenance/parserTests.txt
===================================================================
--- trunk/phase3/maintenance/parserTests.txt 2010-02-01 03:18:58 UTC (rev
61774)
+++ trunk/phase3/maintenance/parserTests.txt 2010-02-01 04:55:15 UTC (rev
61775)
@@ -3283,7 +3283,7 @@
!! input
[[Image:foobar.jpg|thumb|http://example.com]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="http://example.com"; class="external free"
rel="nofollow">http://example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="http://example.com"; class="external free"
rel="nofollow">http://example.com</a></div></div></div>
!! end
@@ -3292,7 +3292,7 @@
!! input
[[Image:foobar.jpg|thumb|http://example.com|alt=Alteration]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Alteration"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="http://example.com"; class="external free"
rel="nofollow">http://example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="Alteration"
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="http://example.com"; class="external free"
rel="nofollow">http://example.com</a></div></div></div>
!! end
@@ -3301,7 +3301,7 @@
!! input
[[Image:foobar.jpg|thumb|ISBN 1235467890]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="/wiki/Special:BookSources/1235467890" class="internal
mw-magiclink-isbn">ISBN 1235467890</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><a href="/wiki/Special:BookSources/1235467890" class="internal
mw-magiclink-isbn">ISBN 1235467890</a></div></div></div>
!! end
@@ -3310,7 +3310,7 @@
!! input
[[Image:foobar.jpg|thumb|This is RFC 12354]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This is <a href="http://tools.ietf.org/html/rfc12354";
class="external mw-magiclink-rfc">RFC 12354</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This is <a href="http://tools.ietf.org/html/rfc12354";
class="external mw-magiclink-rfc">RFC 12354</a></div></div></div>
!! end
@@ -3319,7 +3319,7 @@
!! input
[[Image:foobar.jpg|thumb|Please mailto:nob...@example.com]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Please <a href="mailto:nob...@example.com"; class="external free"
rel="nofollow">mailto:nob...@example.com</a></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>Please <a href="mailto:nob...@example.com"; class="external free"
rel="nofollow">mailto:nob...@example.com</a></div></div></div>
!! end
@@ -3329,7 +3329,7 @@
!! input
[[Image:foobar.jpg|thumb|<math>2+2</math>]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><math>2+2</math></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><math>2+2</math></div></div></div>
!! end
@@ -3340,7 +3340,7 @@
!! input
[[Image:foobar.jpg|thumb|<math>2+2</math>]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><span class="texhtml">2 + 2</span></div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div><span class="texhtml">2 + 2</span></div></div></div>
!! end
@@ -3413,7 +3413,7 @@
!! input
[[Image:Foobar.jpg|thumb|This is a caption with another
[[Image:icon.png|image]] inside it!]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This is a caption with another <a
href="/index.php?title=Special:Upload&wpDestFile=Icon.png" class="new"
title="File:Icon.png">File:Icon.png</a> inside it!</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This is a caption with another <a
href="/index.php?title=Special:Upload&wpDestFile=Icon.png" class="new"
title="File:Icon.png">File:Icon.png</a> inside it!</div></div></div>
!! end
@@ -3433,7 +3433,7 @@
!! input
[[Image:Foobar.jpg|thumb|200px|This caption has [irc://example.net irc] and
[https://example.com Secure] ext links in it.]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg";
width="200" height="23" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This caption has <a href="irc://example.net" class="external text"
rel="nofollow">irc</a> and <a href="https://example.com"; class="external text"
rel="nofollow">Secure</a> ext links in it.</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:202px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="200" height="23"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>This caption has <a href="irc://example.net" class="external text"
rel="nofollow">irc</a> and <a href="https://example.com"; class="external text"
rel="nofollow">Secure</a> ext links in it.</div></div></div>
!! end
@@ -6381,7 +6381,7 @@
!! input
[[Image:foobar.jpg|640x480px]]
!! result
-<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg";
width="640" height="73" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/3/3a/Foobar.jpg"; width="640" height="73" /></a>
</p>
!!end
@@ -6390,7 +6390,7 @@
!! input
[[Image:foobar.jpg|640px]]
!! result
-<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg";
width="640" height="73" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/3/3a/Foobar.jpg"; width="640" height="73" /></a>
</p>
!!end
@@ -6399,7 +6399,7 @@
!! input
[[Image:foobar.jpg|640px ]]
!! result
-<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg";
width="640" height="73" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/3/3a/Foobar.jpg"; width="640" height="73" /></a>
</p>
!!end
@@ -6408,7 +6408,7 @@
!! input
[[Image:foobar.jpg| 640px]]
!! result
-<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg";
width="640" height="73" /></a>
+<p><a href="/wiki/File:Foobar.jpg" class="image"><img alt="Foobar.jpg"
src="http://example.com/images/3/3a/Foobar.jpg"; width="640" height="73" /></a>
</p>
!!end
@@ -6450,7 +6450,7 @@
!! input
[[image:Foobar.jpg|thumb|An [http://test/?param1=|left|¶m2=|x external]
URL]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="An external URL"
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>An <a href="http://test/?param1=|left|&param2=|x"
class="external text" rel="nofollow">external</a> URL</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt="An external URL"
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>An <a href="http://test/?param1=|left|&param2=|x"
class="external text" rel="nofollow">external</a> URL</div></div></div>
!!end
@@ -7351,7 +7351,7 @@
!! input
[[Image:Foobar.jpg|thumb|http://x|hello]]
!! result
-<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg";
width="180" height="20" class="thumbimage" /></a> <div
class="thumbcaption"><div class="magnify"><a href="/wiki/File:Foobar.jpg"
class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>hello</div></div></div>
+<div class="thumb tright"><div class="thumbinner" style="width:182px;"><a
href="/wiki/File:Foobar.jpg" class="image"><img alt=""
src="http://example.com/images/3/3a/Foobar.jpg"; width="180" height="20"
class="thumbimage" /></a> <div class="thumbcaption"><div class="magnify"><a
href="/wiki/File:Foobar.jpg" class="internal" title="Enlarge"><img
src="/skins/common/images/magnify-clip.png" width="15" height="11" alt=""
/></a></div>hello</div></div></div>
!! end
Modified: trunk/phase3/tests/MediaWikiParserTest.php
===================================================================
--- trunk/phase3/tests/MediaWikiParserTest.php 2010-02-01 03:18:58 UTC (rev
61774)
+++ trunk/phase3/tests/MediaWikiParserTest.php 2010-02-01 04:55:15 UTC (rev
61775)
@@ -23,7 +23,6 @@
function showSuccess( $desc ) {
$this->cb->assertTrue( true, $desc );
- echo "PASSED: $desc\n";
return true;
}
@@ -146,21 +145,10 @@
$wgStyleSheetPath = '/skins';
$wgStylePath = '/skins';
$wgThumbnailScriptPath = false;
- $this->uploadDir = $this->setupUploadDir();
- $wgLocalFileRepo = array(
- 'class' => 'LocalRepo',
- 'name' => 'local',
- 'directory' => $this->uploadDir,
- 'url' => 'http://example.com/images',
- 'hashLevels' => 2,
- 'transformVia404' => false,
- );
- //$wgNamespacesWithSubpages = array( 0 => isset(
$opts['subpage'] ) );
$wgNamespaceProtection[NS_MEDIAWIKI] = 'editinterface';
$wgNamespaceAliases['Image'] = NS_FILE;
$wgNamespaceAliases['Image_talk'] = NS_FILE_TALK;
-
$wgEnableParserCache = false;
$wgDeferredUpdateList = array();
$wgMemc =& wfGetMainCache();
@@ -181,35 +169,8 @@
$this->parserTester = new PTShell();
$this->parserTester->setCallback( $this );
- /* global $wgDBtype, $wgDBserver, $wgDBname, $wgDBuser,
$wgDBpassword, $wgDBport, $wgDBmwschema, $wgDBts2chema; */
- /* $this->db['type'] = $wgDBtype; */
- /* $this->db['server'] = $wgDBserver; */
- /* $this->db['name'] = $wgDBname; */
- /* $this->db['user'] = $wgDBuser; */
- /* $this->db['password'] = $wgDBpassword; */
- /* $this->db['port'] = $wgDBport; */
- /* $this->db['mwschema'] = $wgDBmwschema; */
- /* $this->db['ts2schema'] = $wgDBts2chema; */
}
- function tearDown() {
- $this->teardownUploadDir($this->uploadDir);
- /* $db = wfGetDB( DB_MASTER ); */
- /* $db->close(); */
- /* global $wgDBtype, $wgDBserver, $wgDBname, $wgDBuser,
$wgDBpassword, $wgDBport, $wgDBmwschema, $wgDBts2chema; */
-
- /* $wgDBtype = $this->db['type']; */
- /* $wgDBserver = $this->db['server']; */
- /* $wgDBname = $this->db['name']; */
- /* $wgDBuser = $this->db['user']; */
- /* $wgDBpassword = $this->db['password']; */
- /* $wgDBport = $this->db['port']; */
- /* $wgDBmwschema = $this->db['mwschema']; */
- /* $wgDBts2chema = $this->db['ts2schema']; */
-
- }
-
-
function testParser() {
global $IP;
Modified: trunk/phase3/tests/MediaWiki_TestCase.php
===================================================================
--- trunk/phase3/tests/MediaWiki_TestCase.php 2010-02-01 03:18:58 UTC (rev
61774)
+++ trunk/phase3/tests/MediaWiki_TestCase.php 2010-02-01 04:55:15 UTC (rev
61775)
@@ -7,7 +7,10 @@
*/
protected function buildTestDatabase( $tables ) {
global $testOptions, $wgDBprefix, $wgDBserver, $wgDBadminuser,
$wgDBadminpassword, $wgDBname;
- $this->markTestIncomplete("This test requires DB admin user
credentials.");
+ if(!$wgDBadminuser || !$wgDBadminpassword) {
+ $this->markTestIncomplete("This test requires DB admin
user credentials.");
+ }
+
$wgDBprefix = 'parsertest_';
$db = new DatabaseMysql(
@@ -16,7 +19,8 @@
$wgDBadminpassword,
$wgDBname );
if( $db->isOpen() ) {
- if (!(strcmp($db->getServerVersion(), '4.1') < 0 and
stristr($db->getSoftwareLink(), 'MySQL'))) {
+ if (!(strcmp($db->getServerVersion(), '4.1') < 0 and
+ stristr($db->getSoftwareLink(), 'MySQL'))) {
# Database that supports CREATE TABLE ... LIKE
foreach ($tables as $tbl) {
$newTableName = $db->tableName( $tbl );
@@ -41,7 +45,6 @@
}
$db->query($create_tmp);
}
-
}
return $db;
} else {
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
![http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg"](http://example.com/images/thumb/3/3a/Foobar.jpg/180px-Foobar.jpg"){kind=link}
![http://example.com/images/3/3a/Foobar.jpg"](http://example.com/images/3/3a/Foobar.jpg"){kind=link}
![http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg"](http://example.com/images/thumb/3/3a/Foobar.jpg/200px-Foobar.jpg"){kind=link}
![http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg"](http://example.com/images/thumb/3/3a/Foobar.jpg/640px-Foobar.jpg"){kind=link}