From: Krinkle <krinkle@users.mediawiki.org>
Date: Mon, 12 Sep 2011 22:18:33 +0000 (+0000)
Subject: Use a username different from the main BlockTest.php, otherwise concurrency errors... 
X-Git-Tag: 1.31.0-rc.0~27705
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/One?a=commitdiff_plain;h=9b9b7df01ebce28b5457fdf960eb2a07648b72ef;p=lhc%2Fweb%2Fwiklou.git

Use a username different from the main BlockTest.php, otherwise concurrency errors occur (as seen on Jenkins builds)
---

diff --git a/tests/phpunit/includes/api/ApiBlockTest.php b/tests/phpunit/includes/api/ApiBlockTest.php
index 91fb146d44..1f3d55d338 100644
--- a/tests/phpunit/includes/api/ApiBlockTest.php
+++ b/tests/phpunit/includes/api/ApiBlockTest.php
@@ -15,11 +15,11 @@ class ApiBlockTest extends ApiTestCase {
 	}
 
 	function addDBData() {
-		$user = User::newFromName( 'UTBlockee' );
+		$user = User::newFromName( 'UTApiBlockee' );
 
 		if ( $user->getId() == 0 ) {
 			$user->addToDatabase();
-			$user->setPassword( 'UTBlockeePassword' );
+			$user->setPassword( 'UTApiBlockeePassword' );
 
 			$user->saveSettings();
 		}
@@ -29,10 +29,10 @@ class ApiBlockTest extends ApiTestCase {
 
 		$data = $this->getTokens();
 
-		$user = User::newFromName( 'UTBlockee' );
+		$user = User::newFromName( 'UTApiBlockee' );
 
 		if ( !$user->getId() ) {
-			$this->markTestIncomplete( "The user UTBlockee does not exist" );
+			$this->markTestIncomplete( "The user UTApiBlockee does not exist" );
 		}
 
 		if( !isset( $data[0]['query']['pages'] ) ) {
@@ -45,15 +45,15 @@ class ApiBlockTest extends ApiTestCase {
 
 		$data = $this->doApiRequest( array(
 			'action' => 'block',
-			'user' => 'UTBlockee',
+			'user' => 'UTApiBlockee',
 			'reason' => 'Some reason',
 			'token' => $pageinfo['blocktoken'] ), $data );
 
-		$block = Block::newFromTarget('UTBlockee');
+		$block = Block::newFromTarget('UTApiBlockee');
 
 		$this->assertTrue( !is_null( $block ), 'Block is valid' );
 
-		$this->assertEquals( 'UTBlockee', (string)$block->getTarget() );
+		$this->assertEquals( 'UTApiBlockee', (string)$block->getTarget() );
 		$this->assertEquals( 'Some reason', $block->mReason );
 		$this->assertEquals( 'infinity', $block->mExpiry );