X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Fdeferred%2FMWCallableUpdateTest.php;h=6977aef1a26f574e2c173b4fa6129b9b77a1bcbf;hp=088ab4f5447c0a7e5ed22f2ba48995024bf20b6d;hb=ee56f00ddf0609082f8ae9a4dc3e6e1b6f54ddfd;hpb=a18476eab39dc201384c68cbd27228c5af32f7fc

diff --git a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php b/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
index 088ab4f544..6977aef1a2 100644
--- a/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
+++ b/tests/phpunit/includes/deferred/MWCallableUpdateTest.php
@@ -29,8 +29,54 @@ class MWCallableUpdateTest extends PHPUnit_Framework_TestCase {
 		// Emulate rollback
 		$db->rollback( __METHOD__ );
 
+		$update->doUpdate();
+
+		// Ensure it was cancelled
+		$this->assertSame( 0, $ran );
+	}
+
+	public function testCancelSome() {
+		// Prepare update and DB
+		$db1 = new DatabaseTestHelper( __METHOD__ );
+		$db1->begin( __METHOD__ );
+		$db2 = new DatabaseTestHelper( __METHOD__ );
+		$db2->begin( __METHOD__ );
+		$ran = 0;
+		$update = new MWCallableUpdate( function () use ( &$ran ) {
+			$ran++;
+		}, __METHOD__, [ $db1, $db2 ] );
+
+		// Emulate rollback
+		$db1->rollback( __METHOD__ );
+
+		$update->doUpdate();
+
+		// Prevents: "Notice: DB transaction writes or callbacks still pending"
+		$db2->rollback( __METHOD__ );
+
 		// Ensure it was cancelled
+		$this->assertSame( 0, $ran );
+	}
+
+	public function testCancelAll() {
+		// Prepare update and DB
+		$db1 = new DatabaseTestHelper( __METHOD__ );
+		$db1->begin( __METHOD__ );
+		$db2 = new DatabaseTestHelper( __METHOD__ );
+		$db2->begin( __METHOD__ );
+		$ran = 0;
+		$update = new MWCallableUpdate( function () use ( &$ran ) {
+			$ran++;
+		}, __METHOD__, [ $db1, $db2 ] );
+
+		// Emulate rollbacks
+		$db1->rollback( __METHOD__ );
+		$db2->rollback( __METHOD__ );
+
 		$update->doUpdate();
+
+		// Ensure it was cancelled
 		$this->assertSame( 0, $ran );
 	}
+
 }