Cleanup test jobs better

Change-Id: Id89bb6e9056485b51c66569a57cb91bdf9d2d91f

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 9e4a984..fc2f743 100644 (file)
--- a/tests/phpunit/MediaWikiTestCase.php
+++ b/tests/phpunit/MediaWikiTestCase.php
@@ -520,10 +520,17 @@ abstract class MediaWikiTestCase extends PHPUnit_Framework_TestCase {
         * @since 1.21
         */
        public static function teardownTestDB() {
+               global $wgJobClasses;
+
                if ( !self::$dbSetup ) {
                        return;
                }
 
+               foreach ( $wgJobClasses as $type => $class ) {
+                       // Delete any jobs under the clone DB (or old prefix in other stores)
+                       JobQueueGroup::singleton()->get( $type )->delete();
+               }
+
                CloneDatabase::changePrefix( self::$oldTablePrefix );
 
                self::$oldTablePrefix = false;