From: Max Semenik <maxsem@users.mediawiki.org>
Date: Mon, 31 Oct 2011 17:00:29 +0000 (+0000)
Subject: Simplify r101365, this cruft is not really needed
X-Git-Tag: 1.31.0-rc.0~26809
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=7abd9f4abd3cbe25bd5c6b14cb8229ba95f128c8;p=lhc%2Fweb%2Fwiklou.git

Simplify r101365, this cruft is not really needed
---

diff --git a/tests/phpunit/includes/BlockTest.php b/tests/phpunit/includes/BlockTest.php
index 54db18a42d..022da219ce 100644
--- a/tests/phpunit/includes/BlockTest.php
+++ b/tests/phpunit/includes/BlockTest.php
@@ -2,6 +2,7 @@
 
 /**
  * @group Database
+ * @group Blocking
  */
 class BlockTest extends MediaWikiLangTestCase {
 
@@ -27,10 +28,6 @@ class BlockTest extends MediaWikiLangTestCase {
 			$user->saveSettings();
 		}
 
-		$this->createBlock( 100500 );
-	}
-
-	private function createBlock( $expiry ) {
 		// Delete the last round's block if it's still there
 		$oldBlock = Block::newFromTarget( 'UTBlockee' );
 		if ( $oldBlock ) {
@@ -39,7 +36,7 @@ class BlockTest extends MediaWikiLangTestCase {
 		}
 
 		$this->block = new Block( 'UTBlockee', 1, 0,
-			'Parce que', 0, false, time() + $expiry
+			'Parce que', 0, false, time() + 100500
 		);
 		$this->madeAt = wfTimestamp( TS_MW );
 
@@ -79,8 +76,6 @@ class BlockTest extends MediaWikiLangTestCase {
 	 * per bug 26425
 	 */
 	function testBug26425BlockTimestampDefaultsToTime() {
-		$this->createBlock( 0 );
-
 		// delta to stop one-off errors when things happen to go over a second mark.
 		$delta = abs( $this->madeAt - $this->block->mTimestamp );
 		$this->assertLessThan( 2, $delta, "If no timestamp is specified, the block is recorded as time()");