X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=maintenance%2FparserTests.inc;h=7971e64e8b2e4876111cf7429352f9be21941c2f;hb=5c58613f4d77fa214830caced95948e057c0c69e;hp=3559b98346fa47fd57f1815b982bbfc94467f4ef;hpb=13108fbdc068c28c23123e4b60bc554424f3a596;p=lhc%2Fweb%2Fwiklou.git

diff --git a/maintenance/parserTests.inc b/maintenance/parserTests.inc
index 3559b98346..7971e64e8b 100644
--- a/maintenance/parserTests.inc
+++ b/maintenance/parserTests.inc
@@ -20,45 +20,57 @@
 /**
  * @todo Make this more independent of the configuration (and if possible the database)
  * @todo document
- * @package MediaWiki
- * @subpackage Maintenance
+ * @file
+ * @ingroup Maintenance
  */
 
 /** */
 $options = array( 'quick', 'color', 'quiet', 'help', 'show-output', 'record' );
-$optionsWithArgs = array( 'regex' );
+$optionsWithArgs = array( 'regex', 'seed' );
 
 require_once( 'commandLine.inc' );
-require_once( "$IP/includes/ObjectCache.php" );
-require_once( "$IP/includes/BagOStuff.php" );
-require_once( "$IP/includes/Hooks.php" );
 require_once( "$IP/maintenance/parserTestsParserHook.php" );
 require_once( "$IP/maintenance/parserTestsStaticParserHook.php" );
 require_once( "$IP/maintenance/parserTestsParserTime.php" );
 
 /**
- * @package MediaWiki
- * @subpackage Maintenance
+ * @ingroup Maintenance
  */
 class ParserTest {
 	/**
 	 * boolean $color whereas output should be colorized
-	 * @private
 	 */
-	var $color;
+	private $color;
 
 	/**
 	 * boolean $showOutput Show test output
 	 */
-	var $showOutput;
+	private $showOutput;
+
+	/**
+	 * boolean $useTemporaryTables Use temporary tables for the temporary database
+	 */
+	private $useTemporaryTables = true;
+
+	/**
+	 * boolean $databaseSetupDone True if the database has been set up
+	 */
+	private $databaseSetupDone = false;
+
+	/**
+	 * string $oldTablePrefix Original table prefix
+	 */
+	private $oldTablePrefix;
+
+	private $maxFuzzTestLength = 300;
+	private $fuzzSeed = 0;
+	private $memoryLimit = 50;
 
 	/**
 	 * Sets terminal colorization and diff/quick modes depending on OS and
 	 * command-line options (--color and --quick).
-	 *
-	 * @public
 	 */
-	function ParserTest() {
+	public function ParserTest() {
 		global $options;
 
 		# Only colorize output if stdout is a terminal.
@@ -90,6 +102,10 @@ class ParserTest {
 
 
 		if (isset($options['regex'])) {
+			if ( isset( $options['record'] ) ) {
+				echo "Warning: --record cannot be used with --regex, disabling --record\n";
+				unset( $options['record'] );
+			}
 			$this->regex = $options['regex'];
 		} else {
 			# Matches anything
@@ -97,11 +113,16 @@ class ParserTest {
 		}
 
 		if( isset( $options['record'] ) ) {
-			$this->recorder = new DbTestRecorder( $this->term );
+			$this->recorder = new DbTestRecorder( $this );
 		} elseif( isset( $options['compare'] ) ) {
-			$this->recorder = new DbTestPreviewer( $this->term );
+			$this->recorder = new DbTestPreviewer( $this );
 		} else {
-			$this->recorder = new TestRecorder( $this->term );
+			$this->recorder = new TestRecorder( $this );
+		}
+		$this->keepUploads = isset( $options['keep-uploads'] );
+
+		if ( isset( $options['seed'] ) ) {
+			$this->fuzzSeed = intval( $options['seed'] ) - 1;
 		}
 
 		$this->hooks = array();
@@ -110,9 +131,8 @@ class ParserTest {
 
 	/**
 	 * Remove last character if it is a newline
-	 * @private
 	 */
-	function chomp($s) {
+	private function chomp($s) {
 		if (substr($s, -1) === "\n") {
 			return substr($s, 0, -1);
 		}
@@ -121,6 +141,119 @@ class ParserTest {
 		}
 	}
 
+	/**
+	 * Run a fuzz test series
+	 * Draw input from a set of test files
+	 */
+	function fuzzTest( $filenames ) {
+		$dict = $this->getFuzzInput( $filenames );
+		$dictSize = strlen( $dict );
+		$logMaxLength = log( $this->maxFuzzTestLength );
+		$this->setupDatabase();
+		ini_set( 'memory_limit', $this->memoryLimit * 1048576 );
+
+		$numTotal = 0;
+		$numSuccess = 0;
+		$user = new User;
+		$opts = ParserOptions::newFromUser( $user );
+		$title = Title::makeTitle( NS_MAIN, 'Parser_test' );
+
+		while ( true ) {
+			// Generate test input
+			mt_srand( ++$this->fuzzSeed );
+			$totalLength = mt_rand( 1, $this->maxFuzzTestLength );
+			$input = '';
+			while ( strlen( $input ) < $totalLength ) {
+				$logHairLength = mt_rand( 0, 1000000 ) / 1000000 * $logMaxLength;
+				$hairLength = min( intval( exp( $logHairLength ) ), $dictSize );
+				$offset = mt_rand( 0, $dictSize - $hairLength );
+				$input .= substr( $dict, $offset, $hairLength );
+			}
+
+			$this->setupGlobals();
+			$parser = $this->getParser();
+			// Run the test
+			try {
+				$parser->parse( $input, $title, $opts );
+				$fail = false;
+			} catch ( Exception $exception ) {
+				$fail = true;
+			}
+
+			if ( $fail ) {
+				echo "Test failed with seed {$this->fuzzSeed}\n";
+				echo "Input:\n";
+				var_dump( $input );
+				echo "\n\n";
+				echo "$exception\n";
+			} else {
+				$numSuccess++;
+			}
+			$numTotal++;
+			$this->teardownGlobals();
+			$parser->__destruct();
+
+			if ( $numTotal % 100 == 0 ) {
+				$usage = intval( memory_get_usage( true ) / $this->memoryLimit / 1048576 * 100 );
+				echo "{$this->fuzzSeed}: $numSuccess/$numTotal (mem: $usage%)\n";
+				if ( $usage > 90 ) {
+					echo "Out of memory:\n";
+					$memStats = $this->getMemoryBreakdown();
+					foreach ( $memStats as $name => $usage ) {
+						echo "$name: $usage\n";
+					}
+					$this->abort();
+				}
+			}
+		}
+	}
+
+	/**
+	 * Get an input dictionary from a set of parser test files
+	 */
+	function getFuzzInput( $filenames ) {
+		$dict = '';
+		foreach( $filenames as $filename ) {
+			$contents = file_get_contents( $filename );
+			preg_match_all( '/!!\s*input\n(.*?)\n!!\s*result/s', $contents, $matches );
+			foreach ( $matches[1] as $match ) {
+				$dict .= $match . "\n";
+			}
+		}
+		return $dict;
+	}
+
+	/**
+	 * Get a memory usage breakdown
+	 */
+	function getMemoryBreakdown() {
+		$memStats = array();
+		foreach ( $GLOBALS as $name => $value ) {
+			$memStats['$'.$name] = strlen( serialize( $value ) );
+		}
+		$classes = get_declared_classes();
+		foreach ( $classes as $class ) {
+			$rc = new ReflectionClass( $class );
+			$props = $rc->getStaticProperties();
+			$memStats[$class] = strlen( serialize( $props ) );
+			$methods = $rc->getMethods();
+			foreach ( $methods as $method ) {
+				$memStats[$class] += strlen( serialize( $method->getStaticVariables() ) );
+			}
+		}
+		$functions = get_defined_functions();
+		foreach ( $functions['user'] as $function ) {
+			$rf = new ReflectionFunction( $function );
+			$memStats["$function()"] = strlen( serialize( $rf->getStaticVariables() ) );
+		}
+		asort( $memStats );
+		return $memStats;
+	}
+
+	function abort() {
+		$this->abort();
+	}
+
 	/**
 	 * Run a series of tests listed in the given text files.
 	 * Each test consists of a brief description, wikitext input,
@@ -131,14 +264,15 @@ class ParserTest {
 	 *
 	 * @param array of strings $filenames
 	 * @return bool True if passed all tests, false if any tests failed.
-	 * @public
 	 */
-	function runTestsFromFiles( $filenames ) {
+	public function runTestsFromFiles( $filenames ) {
 		$this->recorder->start();
+		$this->setupDatabase();
 		$ok = true;
 		foreach( $filenames as $filename ) {
 			$ok = $this->runFile( $filename ) && $ok;
 		}
+		$this->teardownDatabase();
 		$this->recorder->report();
 		$this->recorder->end();
 		return $ok;
@@ -151,10 +285,7 @@ class ParserTest {
 		} else {
 			global $IP;
 			$relative = wfRelativePath( $filename, $IP );
-			print $this->term->color( 1 ) .
-				"Reading tests from \"$relative\"..." .
-				$this->term->reset() .
-				"\n";
+			$this->showRunFile( $relative );
 		}
 
 		$data = array();
@@ -250,10 +381,30 @@ class ParserTest {
 				$data[$section] .= $line;
 			}
 		}
-		print "\n";
+		if ( $this->showProgress ) {
+			print "\n";
+		}
 		return $ok;
 	}
 
+	/**
+	 * Get a Parser object
+	 */
+	function getParser() {
+		global $wgParserConf;
+		$class = $wgParserConf['class'];
+		$parser = new $class( $wgParserConf );
+		foreach( $this->hooks as $tag => $callback ) {
+			$parser->setHook( $tag, $callback );
+		}
+		foreach( $this->functionHooks as $tag => $bits ) {
+			list( $callback, $flags ) = $bits;
+			$parser->setFunctionHook( $tag, $callback, $flags );
+		}
+		wfRunHooks( 'ParserTestParser', array( &$parser ) );
+		return $parser;
+	}
+
 	/**
 	 * Run a given wikitext input through a freshly-constructed wiki parser,
 	 * and compare the output against the expected results.
@@ -263,7 +414,7 @@ class ParserTest {
 	 * @param string $result Result to output
 	 * @return bool
 	 */
-	function runTest( $desc, $input, $result, $opts ) {
+	private function runTest( $desc, $input, $result, $opts ) {
 		if( $this->showProgress ) {
 			$this->showTesting( $desc );
 		}
@@ -287,16 +438,7 @@ class ParserTest {
 		}
 
 		$noxml = (bool)preg_match( '~\\b noxml \\b~x', $opts );
-
-		$parser = new Parser();
-		foreach( $this->hooks as $tag => $callback ) {
-			$parser->setHook( $tag, $callback );
-		}
-		foreach( $this->functionHooks as $tag => $callback ) {
-			$parser->setFunctionHook( $tag, $callback );
-		}
-		wfRunHooks( 'ParserTestParser', array( &$parser ) );
-
+		$parser = $this->getParser();
 		$title =& Title::makeTitle( NS_MAIN, $titleText );
 
 		$matches = array();
@@ -304,11 +446,11 @@ class ParserTest {
 			$out = $parser->preSaveTransform( $input, $title, $user, $options );
 		} elseif (preg_match('/\\bmsg\\b/i', $opts)) {
 			$out = $parser->transformMsg( $input, $options );
-		} elseif( preg_match( '/\\bsection=(\d+)\b/i', $opts, $matches ) ) {
-			$section = intval( $matches[1] );
+		} elseif( preg_match( '/\\bsection=([\w-]+)\b/i', $opts, $matches ) ) {
+			$section = $matches[1];
 			$out = $parser->getSection( $input, $section );
-		} elseif( preg_match( '/\\breplace=(\d+),"(.*?)"/i', $opts, $matches ) ) {
-			$section = intval( $matches[1] );
+		} elseif( preg_match( '/\\breplace=([\w-]+),"(.*?)"/i', $opts, $matches ) ) {
+			$section = $matches[1];
 			$replace = $matches[2];
 			$out = $parser->replaceSection( $input, $section, $replace );
 		} else {
@@ -320,7 +462,12 @@ class ParserTest {
 			} else if (preg_match('/\\bcat\\b/i', $opts)) {
 				global $wgOut;
 				$wgOut->addCategoryLinks($output->getCategories());
-				$out = $this->tidy ( implode( ' ', $wgOut->getCategoryLinks() ) );
+				$cats = $wgOut->getCategoryLinks();
+				if ( isset( $cats['normal'] ) ) {
+					$out = $this->tidy( implode( ' ', $cats['normal'] ) );
+				} else {
+					$out = '';
+				}
 			}
 
 			$result = $this->tidy($result);
@@ -335,36 +482,40 @@ class ParserTest {
 		}
 	}
 
+
 	/**
-	 * Set up the global variables for a consistent environment for each test.
-	 * Ideally this should replace the global configuration entirely.
-	 *
-	 * @private
+	 * Use a regex to find out the value of an option
+	 * @param $regex A regex, the first group will be the value returned
+	 * @param $opts Options line to look in
+	 * @param $defaults Default value returned if the regex does not match
 	 */
-	function setupGlobals($opts = '') {
-		# Save the prefixed / quoted table names for later use when we make the temporaries.
-		$db =& wfGetDB( DB_READ );
-		$this->oldTableNames = array();
-		foreach( $this->listTables() as $table ) {
-			$this->oldTableNames[$table] = $db->tableName( $table );
-		}
-		if( !isset( $this->uploadDir ) ) {
-			$this->uploadDir = $this->setupUploadDir();
-		}
-
+	private static function getOptionValue( $regex, $opts, $default ) {
 		$m = array();
-		if( preg_match( '/language=([a-z]+(?:_[a-z]+)?)/', $opts, $m ) ) {
-			$lang = $m[1];
+		if( preg_match( $regex, $opts, $m ) ) {
+			return $m[1];
 		} else {
-			$lang = 'en';
+			return $default;
 		}
+	}
 
-		if( preg_match( '/variant=([a-z]+(?:-[a-z]+)?)/', $opts, $m ) ) {
-			$variant = $m[1];
-		} else {
-			$variant = false;
+	/**
+	 * Set up the global variables for a consistent environment for each test.
+	 * Ideally this should replace the global configuration entirely.
+	 */
+	private function setupGlobals($opts = '') {
+		if( !isset( $this->uploadDir ) ) {
+			$this->uploadDir = $this->setupUploadDir();
 		}
 
+		# Find out values for some special options.
+		$lang =
+			self::getOptionValue( '/language=([a-z]+(?:_[a-z]+)?)/', $opts, 'en' );
+		$variant =
+			self::getOptionValue( '/variant=([a-z]+(?:-[a-z]+)?)/', $opts, false );
+		$maxtoclevel =
+			self::getOptionValue( '/wgMaxTocLevel=(\d+)/', $opts, 999 );
+		$linkHolderBatchSize = 
+			self::getOptionValue( '/wgLinkHolderBatchSize=(\d+)/', $opts, 1000 );
 
 		$settings = array(
 			'wgServer' => 'http://localhost',
@@ -372,8 +523,15 @@ class ParserTest {
 			'wgScriptPath' => '/',
 			'wgArticlePath' => '/wiki/$1',
 			'wgActionPaths' => array(),
-			'wgUploadPath' => 'http://example.com/images',
-			'wgUploadDirectory' => $this->uploadDir,
+			'wgLocalFileRepo' => array(
+				'class' => 'LocalRepo',
+				'name' => 'local',
+				'directory' => $this->uploadDir,
+				'url' => 'http://example.com/images',
+				'hashLevels' => 2,
+				'transformVia404' => false,
+			),
+			'wgEnableUploads' => true,
 			'wgStyleSheetPath' => '/skins',
 			'wgSitename' => 'MediaWiki',
 			'wgServerName' => 'Britney Spears',
@@ -384,7 +542,7 @@ class ParserTest {
 			'wgLang' => null,
 			'wgContLang' => null,
 			'wgNamespacesWithSubpages' => array( 0 => preg_match('/\\bsubpage\\b/i', $opts)),
-			'wgMaxTocLevel' => 999,
+			'wgMaxTocLevel' => $maxtoclevel,
 			'wgCapitalLinks' => true,
 			'wgNoFollowLinks' => true,
 			'wgThumbnailScriptPath' => false,
@@ -394,6 +552,18 @@ class ParserTest {
 			'wgUseTidy' => false,
 			'wgDefaultLanguageVariant' => $variant,
 			'wgVariantArticlePath' => false,
+			'wgGroupPermissions' => array( '*' => array(
+				'createaccount' => true,
+				'read'          => true,
+				'edit'          => true,
+				'createpage'    => true,
+				'createtalk'    => true,
+			) ),
+			'wgNamespaceProtection' => array( NS_MEDIAWIKI => 'editinterface' ),
+			'wgDefaultExternalStore' => array(),
+			'wgForeignFileRepos' => array(),
+			'wgLinkHolderBatchSize' => $linkHolderBatchSize,
+			'wgEnforceHtmlIds' => true,
 			);
 		$this->savedGlobals = array();
 		foreach( $settings as $var => $val ) {
@@ -403,37 +573,36 @@ class ParserTest {
 		$langObj = Language::factory( $lang );
 		$GLOBALS['wgLang'] = $langObj;
 		$GLOBALS['wgContLang'] = $langObj;
+		$GLOBALS['wgMemc'] = new FakeMemCachedClient;
 
-		$GLOBALS['wgLoadBalancer']->loadMasterPos();
 		//$GLOBALS['wgMessageCache'] = new MessageCache( new BagOStuff(), false, 0, $GLOBALS['wgDBname'] );
-		$this->setupDatabase();
 
 		global $wgUser;
 		$wgUser = new User();
 	}
 
-	# List of temporary tables to create, without prefix
-	# Some of these probably aren't necessary
-	function listTables() {
-		$tables = array('user', 'page', 'page_restrictions', 'revision', 'text',
-			'pagelinks', 'imagelinks', 'categorylinks',
-			'templatelinks', 'externallinks', 'langlinks',
-			'site_stats', 'hitcounter',
-			'ipblocks', 'image', 'oldimage',
-			'recentchanges',
-			'watchlist', 'math', 'searchindex',
-			'interwiki', 'querycache',
-			'objectcache', 'job', 'redirect',
-			'querycachetwo'
+	/**
+	 * List of temporary tables to create, without prefix.
+	 * Some of these probably aren't necessary.
+	 */
+	private function listTables() {
+		global $wgDBtype;
+		$tables = array('user', 'page', 'page_restrictions',
+			'protected_titles', 'revision', 'text', 'pagelinks', 'imagelinks',
+			'categorylinks', 'templatelinks', 'externallinks', 'langlinks',
+			'site_stats', 'hitcounter',	'ipblocks', 'image', 'oldimage',
+			'recentchanges', 'watchlist', 'math', 'interwiki',
+			'querycache', 'objectcache', 'job', 'redirect', 'querycachetwo',
+			'archive', 'user_groups', 'page_props', 'category'
 		);
 
-		// FIXME manually adding additional table for the tasks extension
-		// we probably need a better software wide system to register new
-		// tables.
-		global $wgExtensionFunctions;
-		if( in_array('wfTasksExtension' , $wgExtensionFunctions ) ) {
-			$tables[] = 'tasks';
-		}
+		if ($wgDBtype === 'mysql') 
+			array_push( $tables, 'searchindex' );
+		
+		// Allow extensions to add to the list of tables to duplicate;
+		// may be necessary if they hook into page save or other code
+		// which will require them while running tests.
+		wfRunHooks( 'ParserTestTables', array( &$tables ) );
 
 		return $tables;
 	}
@@ -442,133 +611,193 @@ class ParserTest {
 	 * Set up a temporary set of wiki tables to work with for the tests.
 	 * Currently this will only be done once per run, and any changes to
 	 * the db will be visible to later tests in the run.
-	 *
-	 * @private
 	 */
-	function setupDatabase() {
-		static $setupDB = false;
+	private function setupDatabase() {
 		global $wgDBprefix;
+		if ( $this->databaseSetupDone ) {
+			return;
+		}
+		if ( $wgDBprefix === 'parsertest_' ) {
+			throw new MWException( 'setupDatabase should be called before setupGlobals' );
+		}
+		$this->databaseSetupDone = true;
+		$this->oldTablePrefix = $wgDBprefix;
+
+		# CREATE TEMPORARY TABLE breaks if there is more than one server
+		# FIXME: r40209 makes temporary tables break even with just one server
+		# FIXME: (bug 15892); disabling the feature entirely as a temporary fix
+		if ( true || wfGetLB()->getServerCount() != 1 ) {
+			$this->useTemporaryTables = false;
+		}
 
-		# Make sure we don't mess with the live DB
-		if (!$setupDB && $wgDBprefix === 'parsertest_') {
-			# oh teh horror
-			$GLOBALS['wgLoadBalancer'] = LoadBalancer::newFromParams( $GLOBALS['wgDBservers'] );
-			$db =& wfGetDB( DB_MASTER );
+		$temporary = $this->useTemporaryTables ? 'TEMPORARY' : '';
 
-			$tables = $this->listTables();
+		$db = wfGetDB( DB_MASTER );
+		$tables = $this->listTables();
 
-			if (!(strcmp($db->getServerVersion(), '4.1') < 0 and stristr($db->getSoftwareLink(), 'MySQL'))) {
-				# Database that supports CREATE TABLE ... LIKE
-				global $wgDBtype;
-				if( $wgDBtype == 'postgres' ) {
-					$def = 'INCLUDING DEFAULTS';
-				} else {
-					$def = '';
-				}
-				foreach ($tables as $tbl) {
-					$newTableName = $db->tableName( $tbl );
-					$tableName = $this->oldTableNames[$tbl];
-					$db->query("CREATE TEMPORARY TABLE $newTableName (LIKE $tableName $def)");
-				}
+		if (!(strcmp($db->getServerVersion(), '4.1') < 0 and stristr($db->getSoftwareLink(), 'MySQL'))) {
+			# Database that supports CREATE TABLE ... LIKE
+			global $wgDBtype;
+			if( $wgDBtype == 'postgres' ) {
+				$def = 'INCLUDING DEFAULTS';
 			} else {
-				# Hack for MySQL versions < 4.1, which don't support
-				# "CREATE TABLE ... LIKE". Note that
-				# "CREATE TEMPORARY TABLE ... SELECT * FROM ... LIMIT 0"
-				# would not create the indexes we need....
-				foreach ($tables as $tbl) {
-					$res = $db->query("SHOW CREATE TABLE {$this->oldTableNames[$tbl]}");
-					$row = $db->fetchRow($res);
-					$create = $row[1];
-					$create_tmp = preg_replace('/CREATE TABLE `(.*?)`/', 'CREATE TEMPORARY TABLE `'
-						. $wgDBprefix . $tbl .'`', $create);
-					if ($create === $create_tmp) {
-						# Couldn't do replacement
-						wfDie("could not create temporary table $tbl");
-					}
-					$db->query($create_tmp);
+				$def = '';
+			}
+			foreach ($tables as $tbl) {
+				# Clean up from previous aborted run.  So that table escaping
+				# works correctly across DB engines, we need to change the pre-
+				# fix back and forth so tableName() works right.
+				$this->changePrefix( $this->oldTablePrefix );
+				$oldTableName = $db->tableName( $tbl );
+				$this->changePrefix( 'parsertest_' );
+				$newTableName = $db->tableName( $tbl );
+
+				if ( $db->tableExists( $tbl ) ) {
+					$db->query("DROP TABLE $newTableName");
 				}
-
+				# Create new table
+				$db->query("CREATE $temporary TABLE $newTableName (LIKE $oldTableName $def)");
+			}
+		} else {
+			# Hack for MySQL versions < 4.1, which don't support
+			# "CREATE TABLE ... LIKE". Note that
+			# "CREATE TEMPORARY TABLE ... SELECT * FROM ... LIMIT 0"
+			# would not create the indexes we need....
+			#
+			# Note that we don't bother changing around the prefixes here be-
+			# cause we know we're using MySQL anyway.
+			foreach ($tables as $tbl) {
+				$oldTableName = $db->tableName( $tbl );
+				$res = $db->query("SHOW CREATE TABLE $oldTableName");
+				$row = $db->fetchRow($res);
+				$create = $row[1];
+				$create_tmp = preg_replace('/CREATE TABLE `(.*?)`/', 
+					"CREATE $temporary TABLE `parsertest_$tbl`", $create);
+				if ($create === $create_tmp) {
+					# Couldn't do replacement
+					wfDie("could not create temporary table $tbl");
+				}
+				$db->query($create_tmp);
 			}
-
-			# Hack: insert a few Wikipedia in-project interwiki prefixes,
-			# for testing inter-language links
-			$db->insert( 'interwiki', array(
-				array( 'iw_prefix' => 'Wikipedia',
-				       'iw_url'    => 'http://en.wikipedia.org/wiki/$1',
-				       'iw_local'  => 0 ),
-				array( 'iw_prefix' => 'MeatBall',
-				       'iw_url'    => 'http://www.usemod.com/cgi-bin/mb.pl?$1',
-				       'iw_local'  => 0 ),
-				array( 'iw_prefix' => 'zh',
-				       'iw_url'    => 'http://zh.wikipedia.org/wiki/$1',
-				       'iw_local'  => 1 ),
-				array( 'iw_prefix' => 'es',
-				       'iw_url'    => 'http://es.wikipedia.org/wiki/$1',
-				       'iw_local'  => 1 ),
-				array( 'iw_prefix' => 'fr',
-				       'iw_url'    => 'http://fr.wikipedia.org/wiki/$1',
-				       'iw_local'  => 1 ),
-				array( 'iw_prefix' => 'ru',
-				       'iw_url'    => 'http://ru.wikipedia.org/wiki/$1',
-				       'iw_local'  => 1 ),
-				) );
-
-			# Hack: Insert an image to work with
-			$db->insert( 'image', array(
-				'img_name'        => 'Foobar.jpg',
-				'img_size'        => 12345,
-				'img_description' => 'Some lame file',
-				'img_user'        => 1,
-				'img_user_text'   => 'WikiSysop',
-				'img_timestamp'   => $db->timestamp( '20010115123500' ),
-				'img_width'       => 1941,
-				'img_height'      => 220,
-				'img_bits'        => 24,
-				'img_media_type'  => MEDIATYPE_BITMAP,
-				'img_major_mime'  => "image",
-				'img_minor_mime'  => "jpeg",
-				'img_metadata'    => serialize( array() ),
-				) );
-
-			# Update certain things in site_stats
-			$db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
-
-			$setupDB = true;
 		}
+
+		$this->changePrefix( 'parsertest_' );
+
+		# Hack: insert a few Wikipedia in-project interwiki prefixes,
+		# for testing inter-language links
+		$db->insert( 'interwiki', array(
+			array( 'iw_prefix' => 'wikipedia',
+				   'iw_url'    => 'http://en.wikipedia.org/wiki/$1',
+				   'iw_local'  => 0 ),
+			array( 'iw_prefix' => 'meatball',
+				   'iw_url'    => 'http://www.usemod.com/cgi-bin/mb.pl?$1',
+				   'iw_local'  => 0 ),
+			array( 'iw_prefix' => 'zh',
+				   'iw_url'    => 'http://zh.wikipedia.org/wiki/$1',
+				   'iw_local'  => 1 ),
+			array( 'iw_prefix' => 'es',
+				   'iw_url'    => 'http://es.wikipedia.org/wiki/$1',
+				   'iw_local'  => 1 ),
+			array( 'iw_prefix' => 'fr',
+				   'iw_url'    => 'http://fr.wikipedia.org/wiki/$1',
+				   'iw_local'  => 1 ),
+			array( 'iw_prefix' => 'ru',
+				   'iw_url'    => 'http://ru.wikipedia.org/wiki/$1',
+				   'iw_local'  => 1 ),
+			) );
+
+		# Hack: Insert an image to work with
+		$db->insert( 'image', array(
+			'img_name'        => 'Foobar.jpg',
+			'img_size'        => 12345,
+			'img_description' => 'Some lame file',
+			'img_user'        => 1,
+			'img_user_text'   => 'WikiSysop',
+			'img_timestamp'   => $db->timestamp( '20010115123500' ),
+			'img_width'       => 1941,
+			'img_height'      => 220,
+			'img_bits'        => 24,
+			'img_media_type'  => MEDIATYPE_BITMAP,
+			'img_major_mime'  => "image",
+			'img_minor_mime'  => "jpeg",
+			'img_metadata'    => serialize( array() ),
+			) );
+
+		# Update certain things in site_stats
+		$db->insert( 'site_stats', array( 'ss_row_id' => 1, 'ss_images' => 1, 'ss_good_articles' => 1 ) );
 	}
 
+	/**
+	 * Change the table prefix on all open DB connections/
+	 */
+	protected function changePrefix( $prefix ) {
+		global $wgDBprefix;
+		wfGetLBFactory()->forEachLB( array( $this, 'changeLBPrefix' ), array( $prefix ) );
+		$wgDBprefix = $prefix;
+	}
+
+	public function changeLBPrefix( $lb, $prefix ) {
+		$lb->forEachOpenConnection( array( $this, 'changeDBPrefix' ), array( $prefix ) );
+	}
+
+	public function changeDBPrefix( $db, $prefix ) {
+		$db->tablePrefix( $prefix );
+	}
+
+	private function teardownDatabase() {
+		global $wgDBprefix;
+		if ( !$this->databaseSetupDone ) {
+			return;
+		}
+		$this->changePrefix( $this->oldTablePrefix );
+		$this->databaseSetupDone = false;
+		if ( $this->useTemporaryTables ) {
+			# Don't need to do anything
+			return;
+		}
+
+		/*
+		$tables = $this->listTables();
+		$db = wfGetDB( DB_MASTER );
+		foreach ( $tables as $table ) {
+			$db->query( "DROP TABLE `parsertest_$table`" );
+		}*/
+	}
+	
 	/**
 	 * Create a dummy uploads directory which will contain a couple
 	 * of files in order to pass existence tests.
 	 * @return string The directory
-	 * @private
 	 */
-	function setupUploadDir() {
+	private function setupUploadDir() {
 		global $IP;
+		if ( $this->keepUploads ) {
+			$dir = wfTempDir() . '/mwParser-images';
+			if ( is_dir( $dir ) ) {
+				return $dir;
+			}
+		} else {
+			$dir = wfTempDir() . "/mwParser-" . mt_rand() . "-images";
+		}
 
-		$dir = wfTempDir() . "/mwParser-" . mt_rand() . "-images";
-		mkdir( $dir );
-		mkdir( $dir . '/3' );
-		mkdir( $dir . '/3/3a' );
-
-		$img = "$IP/skins/monobook/headbg.jpg";
-		$h = fopen($img, 'r');
-		$c = fread($h, filesize($img));
-		fclose($h);
-
-		$f = fopen( $dir . '/3/3a/Foobar.jpg', 'wb' );
-		fwrite( $f, $c );
-		fclose( $f );
+		wfDebug( "Creating upload directory $dir\n" );
+		if ( file_exists( $dir ) ) {
+			wfDebug( "Already exists!\n" );
+			return $dir;
+		}
+		wfMkdirParents( $dir . '/3/3a' );
+		copy( "$IP/skins/monobook/headbg.jpg", "$dir/3/3a/Foobar.jpg" );
 		return $dir;
 	}
 
 	/**
 	 * Restore default values and perform any necessary clean-up
 	 * after each test runs.
-	 *
-	 * @private
 	 */
-	function teardownGlobals() {
+	private function teardownGlobals() {
+		RepoGroup::destroySingleton();
+		FileCache::destroySingleton();
+		LinkCache::singleton()->clear();
 		foreach( $this->savedGlobals as $var => $val ) {
 			$GLOBALS[$var] = $val;
 		}
@@ -580,9 +809,12 @@ class ParserTest {
 
 	/**
 	 * Remove the dummy uploads directory
-	 * @private
 	 */
-	function teardownUploadDir( $dir ) {
+	private function teardownUploadDir( $dir ) {
+		if ( $this->keepUploads ) {
+			return;
+		}
+
 		// delete the files first, then the dirs.
 		self::deleteFiles(
 			array (
@@ -610,7 +842,7 @@ class ParserTest {
 	}
 
 	/**
-	 * @desc delete the specified files, if they exist.
+	 * Delete the specified files, if they exist.
 	 * @param array $files full paths to files to delete.
 	 */
 	private static function deleteFiles( $files ) {
@@ -622,7 +854,7 @@ class ParserTest {
 	}
 
 	/**
-	 * @desc delete the specified directories, if they exist. Must be empty.
+	 * Delete the specified directories, if they exist. Must be empty.
 	 * @param array $dirs full paths to directories to delete.
 	 */
 	private static function deleteDirs( $dirs ) {
@@ -635,9 +867,8 @@ class ParserTest {
 
 	/**
 	 * "Running test $desc..."
-	 * @private
 	 */
-	function showTesting( $desc ) {
+	protected function showTesting( $desc ) {
 		print "Running test $desc... ";
 	}
 
@@ -646,9 +877,8 @@ class ParserTest {
 	 *
 	 * @param string $desc The test name
 	 * @return bool
-	 * @private
 	 */
-	function showSuccess( $desc ) {
+	protected function showSuccess( $desc ) {
 		if( $this->showProgress ) {
 			print $this->term->color( '1;32' ) . 'PASSED' . $this->term->reset() . "\n";
 		}
@@ -663,9 +893,8 @@ class ParserTest {
 	 * @param string $result Expected HTML output
 	 * @param string $html Actual HTML output
 	 * @return bool
-	 * @private
 	 */
-	function showFailure( $desc, $result, $html ) {
+	protected function showFailure( $desc, $result, $html ) {
 		if( $this->showFailure ) {
 			if( !$this->showProgress ) {
 				# In quiet mode we didn't show the 'Testing' message before the
@@ -695,9 +924,8 @@ class ParserTest {
 	 * @param string $inFileTail Tailing for the input file name
 	 * @param string $outFileTail Tailing for the output file name
 	 * @return string
-	 * @private
 	 */
-	function quickDiff( $input, $output, $inFileTail='expected', $outFileTail='actual' ) {
+	protected function quickDiff( $input, $output, $inFileTail='expected', $outFileTail='actual' ) {
 		$prefix = wfTempDir() . "/mwParser-" . mt_rand();
 
 		$infile = "$prefix-$inFileTail";
@@ -718,9 +946,8 @@ class ParserTest {
 	 *
 	 * @param string $data
 	 * @param string $filename
-	 * @private
 	 */
-	function dumpToFile( $data, $filename ) {
+	private function dumpToFile( $data, $filename ) {
 		$file = fopen( $filename, "wt" );
 		fwrite( $file, $data . "\n" );
 		fclose( $file );
@@ -732,9 +959,8 @@ class ParserTest {
 	 *
 	 * @param string $text
 	 * @return string
-	 * @private
 	 */
-	function colorDiff( $text ) {
+	protected function colorDiff( $text ) {
 		return preg_replace(
 			array( '/^(-.*)$/m', '/^(\+.*)$/m' ),
 			array( $this->term->color( 34 ) . '$1' . $this->term->reset(),
@@ -742,14 +968,25 @@ class ParserTest {
 			$text );
 	}
 
+	/**
+	 * Show "Reading tests from ..."
+	 *
+	 * @param String $path
+	 */
+	protected function showRunFile( $path ){
+		print $this->term->color( 1 ) .
+			"Reading tests from \"$path\"..." .
+			$this->term->reset() .
+			"\n";
+	}
+
 	/**
 	 * Insert a temporary test article
 	 * @param string $name the title, including any prefix
 	 * @param string $text the article text
 	 * @param int $line the input line number, for reporting errors
-	 * @private
 	 */
-	function addArticle($name, $text, $line) {
+	private function addArticle($name, $text, $line) {
 		$this->setupGlobals();
 		$title = Title::newFromText( $name );
 		if ( is_null($title) ) {
@@ -803,9 +1040,8 @@ class ParserTest {
 	 * @param string $text the text to tidy
 	 * @return string
 	 * @static
-	 * @private
 	 */
-	function tidy( $text ) {
+	private function tidy( $text ) {
 		global $wgUseTidy;
 		if ($wgUseTidy) {
 			$text = Parser::tidy($text);
@@ -813,7 +1049,7 @@ class ParserTest {
 		return $text;
 	}
 
-	function wellFormed( $text ) {
+	private function wellFormed( $text ) {
 		$html =
 			Sanitizer::hackDocType() .
 			'<html>' .
@@ -837,7 +1073,7 @@ class ParserTest {
 		return true;
 	}
 
-	function extractFragment( $text, $position ) {
+	private function extractFragment( $text, $position ) {
 		$start = max( 0, $position - 10 );
 		$before = $position - $start;
 		$fragment = '...' .
@@ -871,9 +1107,8 @@ class AnsiTermColorer {
 	 *
 	 * @param string $color Semicolon-separated list of attribute/color codes
 	 * @return string
-	 * @private
 	 */
-	function color( $color ) {
+	public function color( $color ) {
 		global $wgCommandLineDarkBg;
 		$light = $wgCommandLineDarkBg ? "1;" : "0;";
 		return "\x1b[{$light}{$color}m";
@@ -883,27 +1118,30 @@ class AnsiTermColorer {
 	 * Return ANSI terminal escape code for restoring default text attributes
 	 *
 	 * @return string
-	 * @private
 	 */
-	function reset() {
+	public function reset() {
 		return $this->color( 0 );
 	}
 }
 
 /* A colour-less terminal */
 class DummyTermColorer {
-	function color( $color ) {
+	public function color( $color ) {
 		return '';
 	}
 
-	function reset() {
+	public function reset() {
 		return '';
 	}
 }
 
 class TestRecorder {
-	function __construct( $term ) {
-		$this->term = $term;
+	var $parent;
+	var $term;
+
+	function __construct( $parent ) {
+		$this->parent = $parent;
+		$this->term = $parent->term;
 	}
 
 	function start() {
@@ -932,23 +1170,31 @@ class TestRecorder {
 		$ratio = wfPercent( 100 * $success / $total );
 		print $this->term->color( 1 ) . "Passed $success of $total tests ($ratio)... ";
 		if( $success == $total ) {
-			print $this->term->color( 32 ) . "PASSED!";
+			print $this->term->color( 32 ) . "ALL TESTS PASSED!";
 		} else {
-			print $this->term->color( 31 ) . "FAILED!";
+			$failed = $total - $success ;
+			print $this->term->color( 31 ) . "$failed tests failed!";
 		}
 		print $this->term->reset() . "\n";
 		return ($success == $total);
 	}
 }
 
-class DbTestRecorder extends TestRecorder  {
+class DbTestPreviewer extends TestRecorder  {
+	protected $lb;      ///< Database load balancer
 	protected $db;      ///< Database connection to the main DB
 	protected $curRun;  ///< run ID number for the current run
 	protected $prevRun; ///< run ID number for the previous run, if any
+	protected $results; ///< Result array
 
-	function __construct( $term ) {
-		parent::__construct( $term );
-		$this->db = wfGetDB( DB_MASTER );
+	/**
+	 * This should be called before the table prefix is changed
+	 */
+	function __construct( $parent ) {
+		parent::__construct( $parent );
+		$this->lb = wfGetLBFactory()->newMainLB();
+		// This connection will have the wiki's table prefix, not parsertest_
+		$this->db = $this->lb->getConnection( DB_MASTER );
 	}
 
 	/**
@@ -956,143 +1202,223 @@ class DbTestRecorder extends TestRecorder  {
 	 * and all that fun stuff
 	 */
 	function start() {
+		global $wgDBtype, $wgDBprefix;
 		parent::start();
 
-		$this->db->begin();
-
-		if( ! $this->db->tableExists( 'testrun' ) or ! $this->db->tableExists( 'testitem') ) {
-			print "WARNING> `testrun` table not found in database. Trying to create table.\n";
-			dbsource( 'testRunner.sql',  $this->db );
-			echo "OK, resuming.\n";
+		if( ! $this->db->tableExists( 'testrun' ) 
+			or ! $this->db->tableExists( 'testitem' ) ) 
+		{
+			print "WARNING> `testrun` table not found in database.\n";
+			$this->prevRun = false;
+		} else {
+			// We'll make comparisons against the previous run later...
+			$this->prevRun = $this->db->selectField( 'testrun', 'MAX(tr_id)' );
 		}
-
-		// We'll make comparisons against the previous run later...
-		$this->prevRun = $this->db->selectField( 'testrun', 'MAX(tr_id)' );
-
-		$this->db->insert( 'testrun',
-			array(
-				'tr_date'        => $this->db->timestamp(),
-				'tr_mw_version'  => SpecialVersion::getVersion(),
-				'tr_php_version' => phpversion(),
-				'tr_db_version'  => $this->db->getServerVersion(),
-				'tr_uname'       => php_uname()
-			),
-			__METHOD__ );
-		$this->curRun = $this->db->insertId();
+		$this->results = array();
 	}
 
-	/**
-	 * Record an individual test item's success or failure to the db
-	 * @param string $test
-	 * @param bool $result
-	 */
 	function record( $test, $result ) {
 		parent::record( $test, $result );
-		$this->db->insert( 'testitem',
-			array(
-				'ti_run'     => $this->curRun,
-				'ti_name'    => $test,
-				'ti_success' => $result ? 1 : 0,
-			),
-			__METHOD__ );
-	}
-
-	/**
-	 * Commit transaction and clean up for result recording
-	 */
-	function end() {
-		$this->db->commit();
-		parent::end();
+		$this->results[$test] = $result;
 	}
 
 	function report() {
 		if( $this->prevRun ) {
+			// f = fail, p = pass, n = nonexistent
+			// codes show before then after
 			$table = array(
-				array( 'previously failing test(s) now PASSING! :)', 0, 1 ),
-				array( 'previously PASSING test(s) removed o_O', 1, null ),
-				array( 'new PASSING test(s) :)', null, 1 ),
-
-				array( 'previously passing test(s) now FAILING! :(', 1, 0 ),
-				array( 'previously FAILING test(s) removed O_o', 0, null ),
-				array( 'new FAILING test(s) :(', null, 0 ),
-				array( 'still FAILING test(s) :(', 0, 0 ),
+				'fp' => 'previously failing test(s) now PASSING! :)',
+				'pn' => 'previously PASSING test(s) removed o_O',
+				'np' => 'new PASSING test(s) :)',
+
+				'pf' => 'previously passing test(s) now FAILING! :(',
+				'fn' => 'previously FAILING test(s) removed O_o',
+				'nf' => 'new FAILING test(s) :(',
+				'ff' => 'still FAILING test(s) :(',
 			);
-			foreach( $table as $criteria ) {
-				list( $label, $before, $after ) = $criteria;
-				$differences = $this->compareResult( $before, $after );
-				if( $differences ) {
-					$count = count($differences);
-					printf( "%4d %s\n", $count, $label );
-					foreach ($differences as $differing_test_name) {
-						print "      * $differing_test_name\n";
+
+			$prevResults = array();
+
+			$res = $this->db->select( 'testitem', array( 'ti_name', 'ti_success' ),
+				array( 'ti_run' => $this->prevRun ), __METHOD__ );
+			foreach ( $res as $row ) {
+				if ( !$this->parent->regex 
+					|| preg_match( "/{$this->parent->regex}/i", $row->ti_name ) )
+				{
+					$prevResults[$row->ti_name] = $row->ti_success;
+				}
+			}
+
+			$combined = array_keys( $this->results + $prevResults );
+
+			# Determine breakdown by change type
+			$breakdown = array();
+			foreach ( $combined as $test ) {
+				if ( !isset( $prevResults[$test] ) ) {
+					$before = 'n';
+				} elseif ( $prevResults[$test] == 1 ) {
+					$before = 'p';
+				} else /* if ( $prevResults[$test] == 0 )*/ {
+					$before = 'f';
+				}
+				if ( !isset( $this->results[$test] ) ) {
+					$after = 'n';
+				} elseif ( $this->results[$test] == 1 ) {
+					$after = 'p';
+				} else /*if ( $this->results[$test] == 0 ) */ {
+					$after = 'f';
+				}
+				$code = $before . $after;
+				if ( isset( $table[$code] ) ) {
+					$breakdown[$code][$test] = $this->getTestStatusInfo( $test, $after );
+				}
+			}
+
+			# Write out results
+			foreach ( $table as $code => $label ) {
+				if( !empty( $breakdown[$code] ) ) {
+					$count = count($breakdown[$code]);
+					printf( "\n%4d %s\n", $count, $label );
+					foreach ($breakdown[$code] as $differing_test_name => $statusInfo) {
+						print "      * $differing_test_name  [$statusInfo]\n";
 					}
 				}
 			}
 		} else {
 			print "No previous test runs to compare against.\n";
 		}
+		print "\n";
 		parent::report();
 	}
 
 	/**
-	 ** @desc: Returns an array of the test names with changed results, based on the specified
-	 **        before/after criteria.
+	 ** Returns a string giving information about when a test last had a status change.
+	 ** Could help to track down when regressions were introduced, as distinct from tests
+	 ** which have never passed (which are more change requests than regressions).
 	 */
-	private function compareResult( $before, $after ) {
-		$testitem = $this->db->tableName( 'testitem' );
-		$prevRun = intval( $this->prevRun );
-		$curRun = intval( $this->curRun );
-		$prevStatus = $this->condition( $before );
-		$curStatus = $this->condition( $after );
-
-		// note: requires mysql >= ver 4.1 for subselects
-		if( is_null( $after ) ) {
-			$sql = "
-				select prev.ti_name as t from $testitem as prev
-					where prev.ti_run=$prevRun and
-						prev.ti_success $prevStatus and
-						(select current.ti_success from $testitem as current
-							where current.ti_run=$curRun
-								and prev.ti_name=current.ti_name) $curStatus";
-		} else {
-			$sql = "
-				select current.ti_name as t from $testitem as current 
-					where current.ti_run=$curRun and
-						current.ti_success $curStatus and
-						(select prev.ti_success from $testitem as prev
-							where prev.ti_run=$prevRun
-								and prev.ti_name=current.ti_name) $prevStatus";
+	private function getTestStatusInfo($testname, $after) {
+
+		// If we're looking at a test that has just been removed, then say when it first appeared.
+		if ( $after == 'n' ) {
+			$changedRun = $this->db->selectField ( 'testitem',
+												   'MIN(ti_run)',
+												   array( 'ti_name' => $testname ),
+												   __METHOD__ );
+			$appear = $this->db->selectRow ( 'testrun',
+											 array( 'tr_date', 'tr_mw_version' ),
+											 array( 'tr_id' => $changedRun ),
+											 __METHOD__ );
+			return "First recorded appearance: "
+			       . date( "d-M-Y H:i:s",  strtotime ( $appear->tr_date ) )
+			       .  ", " . $appear->tr_mw_version;
 		}
-		$result = $this->db->query( $sql, __METHOD__ );
-		$retval = array();
-		while ($row = $this->db->fetchObject( $result )) {
-			$retval[] = $row->t;
+
+		// Otherwise, this test has previous recorded results.
+		// See when this test last had a different result to what we're seeing now.
+		$conds = array( 
+			'ti_name'    => $testname,
+			'ti_success' => ($after == 'f' ? "1" : "0") );
+		if ( $this->curRun ) {
+			$conds[] = "ti_run != " . $this->db->addQuotes ( $this->curRun );
 		}
-		$this->db->freeResult( $result );
-		return $retval;
-	}
 
-	/**
-	 ** @desc: Helper function for compareResult() database querying.
-	 */
-	private function condition( $value ) {
-		if( is_null( $value ) ) {
-			return 'IS NULL';
+		$changedRun = $this->db->selectField ( 'testitem', 'MAX(ti_run)', $conds, __METHOD__ );
+
+		// If no record of ever having had a different result.
+		if ( is_null ( $changedRun ) ) {
+			if ($after == "f") {
+				return "Has never passed";
+			} else {
+				return "Has never failed";
+			}
+		}
+
+		// Otherwise, we're looking at a test whose status has changed.
+		// (i.e. it used to work, but now doesn't; or used to fail, but is now fixed.)
+		// In this situation, give as much info as we can as to when it changed status.
+		$pre  = $this->db->selectRow ( 'testrun',
+										array( 'tr_date', 'tr_mw_version' ),
+										array( 'tr_id' => $changedRun ),
+										__METHOD__ );
+		$post = $this->db->selectRow ( 'testrun',
+										array( 'tr_date', 'tr_mw_version' ),
+										array( "tr_id > " . $this->db->addQuotes ( $changedRun) ),
+										__METHOD__,
+										array( "LIMIT" => 1, "ORDER BY" => 'tr_id' )
+									 );
+
+		if ( $post ) {
+			$postDate = date( "d-M-Y H:i:s",  strtotime ( $post->tr_date  ) ) . ", {$post->tr_mw_version}";
 		} else {
-			return '=' . intval( $value );
+			$postDate = 'now';
 		}
-	}
+		return ( $after == "f" ? "Introduced" : "Fixed" ) . " between "
+				. date( "d-M-Y H:i:s",  strtotime ( $pre->tr_date ) ) .  ", " . $pre->tr_mw_version
+				. " and $postDate";
 
-}
+	}
 
-class DbTestPreviewer extends DbTestRecorder  {
 	/**
 	 * Commit transaction and clean up for result recording
 	 */
 	function end() {
-		$this->db->rollback();
-		TestRecorder::end();
+		$this->lb->commitMasterChanges();
+		$this->lb->closeAll();
+		parent::end();
 	}
+
 }
 
-?>
+class DbTestRecorder extends DbTestPreviewer  {
+	/**
+	 * Set up result recording; insert a record for the run with the date
+	 * and all that fun stuff
+	 */
+	function start() {
+		global $wgDBtype, $wgDBprefix;
+		$this->db->begin();
+
+		if( ! $this->db->tableExists( 'testrun' ) 
+			or ! $this->db->tableExists( 'testitem' ) ) 
+		{
+			print "WARNING> `testrun` table not found in database. Trying to create table.\n";
+			if ($wgDBtype === 'postgres')
+				$this->db->sourceFile( dirname(__FILE__) . '/testRunner.postgres.sql' );
+			else
+				$this->db->sourceFile( dirname(__FILE__) . '/testRunner.sql' );
+			echo "OK, resuming.\n";
+		}
+		
+		parent::start();
+
+		$this->db->insert( 'testrun',
+			array(
+				'tr_date'        => $this->db->timestamp(),
+				'tr_mw_version'  => SpecialVersion::getVersion(),
+				'tr_php_version' => phpversion(),
+				'tr_db_version'  => $this->db->getServerVersion(),
+				'tr_uname'       => php_uname()
+			),
+			__METHOD__ );
+			if ($wgDBtype === 'postgres')
+				$this->curRun = $this->db->currentSequenceValue('testrun_id_seq');
+			else
+				$this->curRun = $this->db->insertId();
+	}
+
+	/**
+	 * Record an individual test item's success or failure to the db
+	 * @param string $test
+	 * @param bool $result
+	 */
+	function record( $test, $result ) {
+		parent::record( $test, $result );
+		$this->db->insert( 'testitem',
+			array(
+				'ti_run'     => $this->curRun,
+				'ti_name'    => $test,
+				'ti_success' => $result ? 1 : 0,
+			),
+			__METHOD__ );
+	}
+}