Move teardownTestDB and wfLogProfilingData out of MWPHPUnitCommand

Change-Id: Ic175c1457e7f76a2b5232a2b5d3563c5982cfee2

diff --git a/tests/phpunit/MediaWikiPHPUnitCommand.php b/tests/phpunit/MediaWikiPHPUnitCommand.php
index bac9f4d..9f24835 100644 (file)
--- a/tests/phpunit/MediaWikiPHPUnitCommand.php
+++ b/tests/phpunit/MediaWikiPHPUnitCommand.php
@@ -59,12 +59,6 @@ class MediaWikiPHPUnitCommand extends PHPUnit_TextUI_Command {
 
                wfProfileOut( __METHOD__ );
 
-               // Return to real wiki db, so profiling data is preserved
-               MediaWikiTestCase::teardownTestDB();
-
-               // Log profiling data, e.g. in the database or UDP
-               wfLogProfilingData();
-
                if ( $exit ) {
                        exit( $ret );
                } else {

diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index d929b79..573a91a 100644 (file)
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -13,3 +13,18 @@ Running phpunit.php instead is recommended.
 EOF;
        require_once __DIR__ . "/phpunit.php";
 }
+
+class MediaWikiPHPUnitBootstrap {
+
+       public function __destruct() {
+               // Return to real wiki db, so profiling data is preserved
+               MediaWikiTestCase::teardownTestDB();
+
+               // Log profiling data, e.g. in the database or UDP
+               wfLogProfilingData();
+       }
+
+}
+
+// This will be destructed after all tests have been run
+$mediawikiPHPUnitBootstrap = new MediaWikiPHPUnitBootstrap();