From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 11 Dec 2015 23:45:05 +0000 (-0800)
Subject: Cleanup test jobs better
X-Git-Tag: 1.31.0-rc.0~8707^2
X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=93c4cfd71f1bfa7bb9baca38e1a0a1e18d4d0db9;p=lhc%2Fweb%2Fwiklou.git

Cleanup test jobs better

Change-Id: Id89bb6e9056485b51c66569a57cb91bdf9d2d91f
---

diff --git a/tests/phpunit/MediaWikiTestCase.php b/tests/phpunit/MediaWikiTestCase.php
index 9e4a984653..fc2f743e12 100644
--- 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;