From 24b08513ef7ab1127420a70cb76358a08777598b Mon Sep 17 00:00:00 2001 From: Tim Landscheidt Date: Thu, 20 Nov 2014 23:32:23 +0000 Subject: [PATCH 1/1] Fix errors in UIDGeneratorTest::testTimestampedUID Currently, this test passes in Jenkins, but not with Travis CI's hhvm where apparently code execution is slower so not all UIDs are created within the same millisecond. This also previously masked that the test did not indeed test if the host bits are identical as instead it tested the MSBs twice. Bug: 73668 Change-Id: Ic68af599599ace5faa6a687d115d2d3802f6ba1b --- tests/phpunit/includes/utils/UIDGeneratorTest.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php b/tests/phpunit/includes/utils/UIDGeneratorTest.php index 50fa384933..0e11ccad59 100644 --- a/tests/phpunit/includes/utils/UIDGeneratorTest.php +++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php @@ -35,14 +35,14 @@ class UIDGeneratorTest extends MediaWikiTestCase { $lastId_bin = wfBaseConvert( $lastId, 10, 2 ); $this->assertGreaterThanOrEqual( - substr( $id_bin, 0, $tbits ), substr( $lastId_bin, 0, $tbits ), + substr( $id_bin, 0, $tbits ), "New ID timestamp ($id_bin) >= prior one ($lastId_bin)." ); if ( $hostbits ) { $this->assertEquals( - substr( $id_bin, 0, -$hostbits ), - substr( $lastId_bin, 0, -$hostbits ), + substr( $id_bin, -$hostbits ), + substr( $lastId_bin, -$hostbits ), "Host ID of ($id_bin) is same as prior one ($lastId_bin)." ); } -- 2.20.1