Merge branch '2.3' into 2.6

* 2.3:
  [Stopwatch] Fix test
This commit is contained in:
Nicolas Grekas 2015-06-30 18:49:57 +02:00
commit 700487002f
1 changed files with 2 additions and 2 deletions

View File

@ -137,12 +137,12 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
public function testStartTime()
{
$event = new StopwatchEvent(microtime(true) * 1000);
$this->assertLessThan(0.5, $event->getStartTime());
$this->assertLessThanOrEqual(0.5, $event->getStartTime());
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
$event->stop();
$this->assertLessThan(1, $event->getStartTime());
$this->assertLessThanOrEqual(1, $event->getStartTime());
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();