From 7e917c79b3d286e1c96c93c9241d80a4f50b3391 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Mon, 31 Oct 2011 16:54:42 +0000 Subject: [PATCH] Fixed annoying intermittent BlockTest failures. No surprise we had 'em since blocks set to expire RIGHT NOW tend to expire at that very time:) --- tests/phpunit/includes/BlockTest.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/tests/phpunit/includes/BlockTest.php b/tests/phpunit/includes/BlockTest.php index a5ec6c9b6b..54db18a42d 100644 --- a/tests/phpunit/includes/BlockTest.php +++ b/tests/phpunit/includes/BlockTest.php @@ -27,6 +27,10 @@ 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 ) { @@ -35,7 +39,7 @@ class BlockTest extends MediaWikiLangTestCase { } $this->block = new Block( 'UTBlockee', 1, 0, - 'Parce que' + 'Parce que', 0, false, time() + $expiry ); $this->madeAt = wfTimestamp( TS_MW ); @@ -75,6 +79,8 @@ 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()"); -- 2.20.1