From: OverlordQ <overlordq@users.mediawiki.org>
Date: Mon, 28 Feb 2011 21:57:56 +0000 (+0000)
Subject: Followup to r82874, restore lost edits
X-Git-Tag: 1.31.0-rc.0~31715
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=2b99df7615ead0d050a5b7983d169a2b4e36e592;p=lhc%2Fweb%2Fwiklou.git

Followup to r82874, restore lost edits
---

diff --git a/tests/parserTests.php b/tests/parserTests.php
index bc3281624e..580f6fbb5c 100644
--- a/tests/parserTests.php
+++ b/tests/parserTests.php
@@ -21,13 +21,13 @@
  * http://www.gnu.org/copyleft/gpl.html
  *
  * @file
- * @ingroup Maintenance
+ * @ingroup Testing
  */
 
 $options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record', 'run-disabled' );
 $optionsWithArgs = array( 'regex', 'seed', 'setversion' );
 
-require_once( dirname( __FILE__ ) . '/../commandLine.inc' );
+require_once( dirname( __FILE__ ) . '/../maintenance/commandLine.inc' );
 
 if ( isset( $options['help'] ) ) {
 	echo <<<ENDS
@@ -59,8 +59,9 @@ ENDS;
 
 # Cases of weird db corruption were encountered when running tests on earlyish
 # versions of SQLite
-if ( wfGetDB( DB_MASTER )->getType() == 'sqlite' ) {
-	$version = wfGetDB( DB_MASTER )->getServerVersion();
+if ( $wgDBtype == 'sqlite' ) {
+	$db = wfGetDB( DB_MASTER );
+	$version = $db->getServerVersion();
 	if ( version_compare( $version, '3.6' ) < 0 ) {
 		die( "Parser tests require SQLite version 3.6 or later, you have $version\n" );
 	}