Revert "Revert "Removed useless JobQueue return values""

Made the obvious update to a caller missed in the change.

This reverts commit c76d5a95c1dd1c3086461feae8bc1c0b688bde1e.

Change-Id: I67400ba5b9fc7de16c9f9d5075c488c5e58cea9e

1 files changed, 8 insertions, 8 deletions

diff --git a/tests/phpunit/includes/jobqueue/JobQueueTest.php b/tests/phpunit/includes/jobqueue/JobQueueTest.php
index 33194901314e..70374dc651f5 100644
--- a/tests/phpunit/includes/jobqueue/JobQueueTest.php
+++ b/tests/phpunit/includes/jobqueue/JobQueueTest.php
@@ -108,8 +108,8 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" );
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" );
 
-		$this->assertTrue( $queue->push( $this->newJob() ), "Push worked ($desc)" );
-		$this->assertTrue( $queue->batchPush( array( $this->newJob() ) ), "Push worked ($desc)" );
+		$this->assertNull( $queue->push( $this->newJob() ), "Push worked ($desc)" );
+		$this->assertNull( $queue->batchPush( array( $this->newJob() ) ), "Push worked ($desc)" );
 
 		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
 
@@ -157,7 +157,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$queue->flushCaches();
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Active job count ($desc)" );
 
-		$this->assertTrue( $queue->batchPush( array( $this->newJob(), $this->newJob() ) ),
+		$this->assertNull( $queue->batchPush( array( $this->newJob(), $this->newJob() ) ),
 			"Push worked ($desc)" );
 		$this->assertFalse( $queue->isEmpty(), "Queue is not empty ($desc)" );
 
@@ -183,7 +183,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 0, $queue->getSize(), "Queue is empty ($desc)" );
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" );
 
-		$this->assertTrue(
+		$this->assertNull(
 			$queue->batchPush(
 				array( $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() )
 			),
@@ -195,7 +195,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 1, $queue->getSize(), "Queue size is correct ($desc)" );
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "No jobs active ($desc)" );
 
-		$this->assertTrue(
+		$this->assertNull(
 			$queue->batchPush(
 				array( $this->newDedupedJob(), $this->newDedupedJob(), $this->newDedupedJob() )
 			),
@@ -244,7 +244,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$id = wfRandomString( 32 );
 		$root1 = Job::newRootJobParams( "nulljobspam:$id" ); // task ID/timestamp
 		for ( $i = 0; $i < 5; ++$i ) {
-			$this->assertTrue( $queue->push( $this->newJob( 0, $root1 ) ), "Push worked ($desc)" );
+			$this->assertNull( $queue->push( $this->newJob( 0, $root1 ) ), "Push worked ($desc)" );
 		}
 		$queue->deduplicateRootJob( $this->newJob( 0, $root1 ) );
 		sleep( 1 ); // roo job timestamp will increase
@@ -252,7 +252,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertNotEquals( $root1['rootJobTimestamp'], $root2['rootJobTimestamp'],
 			"Root job signatures have different timestamps." );
 		for ( $i = 0; $i < 5; ++$i ) {
-			$this->assertTrue( $queue->push( $this->newJob( 0, $root2 ) ), "Push worked ($desc)" );
+			$this->assertNull( $queue->push( $this->newJob( 0, $root2 ) ), "Push worked ($desc)" );
 		}
 		$queue->deduplicateRootJob( $this->newJob( 0, $root2 ) );
 
@@ -296,7 +296,7 @@ class JobQueueTest extends MediaWikiTestCase {
 		$this->assertEquals( 0, $queue->getAcquiredCount(), "Queue is empty ($desc)" );
 
 		for ( $i = 0; $i < 10; ++$i ) {
-			$this->assertTrue( $queue->push( $this->newJob( $i ) ), "Push worked ($desc)" );
+			$this->assertNull( $queue->push( $this->newJob( $i ) ), "Push worked ($desc)" );
 		}
 
 		for ( $i = 0; $i < 10; ++$i ) {