Merge "Fix Status::getMessage accidentially returning string instead of Message"

[lhc/web/wiklou.git] / tests / phpunit / includes / site / TestSites.php

diff --git a/tests/phpunit/includes/site/TestSites.php b/tests/phpunit/includes/site/TestSites.php
index d9861cd..f224b7d 100644 (file)
--- a/tests/phpunit/includes/site/TestSites.php
+++ b/tests/phpunit/includes/site/TestSites.php
@@ -93,23 +93,8 @@ class TestSites {
         * @since 0.1
         */
        public static function insertIntoDb() {
-               $dbw = wfGetDB( DB_MASTER );
-
-               $trx = $dbw->trxLevel();
-
-               if ( $trx == 0 ) {
-                       $dbw->begin( __METHOD__ );
-               }
-
-               $dbw->delete( 'sites', '*', __METHOD__ );
-               $dbw->delete( 'site_identifiers', '*', __METHOD__ );
-
                $sitesTable = SiteSQLStore::newInstance();
+               $sitesTable->clear();
                $sitesTable->saveSites( TestSites::getSites() );
-
-               if ( $trx == 0 ) {
-                       $dbw->commit( __METHOD__ );
-               }
        }
-
-}
\ No newline at end of file
+}