Merge "Make runOnTransactionIdleCallbacks() handle dangling transactions"

[lhc/web/wiklou.git] / tests / phpunit / includes / jobqueue / JobQueueTest.php

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 70374dc..9808a55 100644 (file)
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -21,8 +21,8 @@ class JobQueueTest extends MediaWikiTestCase {
 
                $this->setMwGlobals( 'wgMemc', new HashBagOStuff() );
 
-               if ( $this->getCliArg( 'use-jobqueue=' ) ) {
-                       $name = $this->getCliArg( 'use-jobqueue=' );
+               if ( $this->getCliArg( 'use-jobqueue' ) ) {
+                       $name = $this->getCliArg( 'use-jobqueue' );
                        if ( !isset( $wgJobTypeConf[$name] ) ) {
                                throw new MWException( "No \$wgJobTypeConf entry for '$name'." );
                        }
@@ -128,8 +128,6 @@ class JobQueueTest extends MediaWikiTestCase {
                $queue->flushCaches();
                if ( $recycles ) {
                        $this->assertEquals( 1, $queue->getAcquiredCount(), "Active job count ($desc)" );
-               } else {
-                       $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
                }
 
                $job2 = $queue->pop();
@@ -139,8 +137,6 @@ class JobQueueTest extends MediaWikiTestCase {
                $queue->flushCaches();
                if ( $recycles ) {
                        $this->assertEquals( 2, $queue->getAcquiredCount(), "Active job count ($desc)" );
-               } else {
-                       $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
                }
 
                $queue->ack( $job1 );
@@ -148,8 +144,6 @@ class JobQueueTest extends MediaWikiTestCase {
                $queue->flushCaches();
                if ( $recycles ) {
                        $this->assertEquals( 1, $queue->getAcquiredCount(), "Active job count ($desc)" );
-               } else {
-                       $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
                }
 
                $queue->ack( $job2 );
@@ -215,8 +209,6 @@ class JobQueueTest extends MediaWikiTestCase {
                $this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" );
                if ( $recycles ) {
                        $this->assertEquals( 1, $queue->getAcquiredCount(), "Active job count ($desc)" );
-               } else {
-                       $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
                }
 
                $queue->ack( $job1 );
@@ -225,6 +217,29 @@ class JobQueueTest extends MediaWikiTestCase {
                $this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
        }
 
+       /**
+        * @dataProvider provider_queueLists
+        * @covers JobQueue
+        */
+       public function testDeduplicationWhileClaimed( $queue, $recycles, $desc ) {
+               $queue = $this->$queue;
+               if ( !$queue ) {
+                       $this->markTestSkipped( $desc );
+               }
+
+               $job = $this->newDedupedJob();
+               $queue->push( $job );
+
+               // De-duplication does not apply to already-claimed jobs
+               $j = $queue->pop();
+               $queue->push( $job );
+               $queue->ack( $j );
+
+               $j = $queue->pop();
+               // Make sure ack() of the twin did not delete the sibling data
+               $this->assertType( 'NullJob', $j );
+       }
+
        /**
         * @dataProvider provider_queueLists
         * @covers JobQueue
@@ -247,8 +262,13 @@ class JobQueueTest extends MediaWikiTestCase {
                        $this->assertNull( $queue->push( $this->newJob( 0, $root1 ) ), "Push worked ($desc)" );
                }
                $queue->deduplicateRootJob( $this->newJob( 0, $root1 ) );
-               sleep( 1 ); // roo job timestamp will increase
-               $root2 = Job::newRootJobParams( "nulljobspam:$id" ); // task ID/timestamp
+
+               $root2 = $root1;
+               # Add a second to UNIX epoch and format back to TS_MW
+               $root2_ts = strtotime( $root2['rootJobTimestamp'] );
+               $root2_ts++;
+               $root2['rootJobTimestamp'] = wfTimestamp( TS_MW, $root2_ts );
+
                $this->assertNotEquals( $root1['rootJobTimestamp'], $root2['rootJobTimestamp'],
                        "Root job signatures have different timestamps." );
                for ( $i = 0; $i < 5; ++$i ) {