diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor #9276 [Stopwatch] Fix tests on Travis (also vagrant) (brikou)

Browse Source 
This PR was submitted for the master branch but it was merged into the 2.2 branch instead (closes #9276).

Discussion
----------

[Stopwatch] Fix tests on Travis (also vagrant)

Travis often fails to run tests related to the Stopwatch Component, check it yourself:

- https://travis-ci.org/symfony/symfony/jobs/12340378
- https://travis-ci.org/symfony/symfony/jobs/12365787
- https://travis-ci.org/symfony/symfony/jobs/12365790
- https://travis-ci.org/symfony/symfony/jobs/12367771
- https://travis-ci.org/symfony/symfony/jobs/12367844
- https://travis-ci.org/symfony/symfony/jobs/12368619
- https://travis-ci.org/symfony/symfony/jobs/12371316
- https://travis-ci.org/symfony/symfony/jobs/12375730

This is because Travis is just slow as hell. So I just multiply the used usleep by 10.

Commits
-------

bf65483 Make usleep longer and simplify assertions
This commit is contained in:
Fabien Potencier 2013-10-15 18:59:36 +02:00
commit 729b41f7af
2 changed files with 22 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/Symfony/Component/Stopwatch/Tests/StopwatchEventTest.php
View File

@ -20,6 +20,8 @@ use Symfony\Component\Stopwatch\StopwatchEvent;
*/
class StopwatchEventTest extends \PHPUnit_Framework_TestCase
{
const DELTA = 20;
public function testGetOrigin()
{
$event = new StopwatchEvent(12);
@ -66,20 +68,18 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
{
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
usleep(20000);
usleep(200000);
$event->stop();
$total = $event->getDuration();
$this->assertTrue($total >= 11 && $total <= 29, $total.' should be 20 (between 11 and 29)');
$this->assertEquals(200, $event->getDuration(), null, self::DELTA);
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
usleep(10000);
usleep(100000);
$event->stop();
$event->start();
usleep(10000);
usleep(100000);
$event->stop();
$total = $event->getDuration();
$this->assertTrue($total >= 11 && $total <= 29, $total.' should be 20 (between 11 and 29)');
$this->assertEquals(200, $event->getDuration(), null, self::DELTA);
}
/**
@ -96,12 +96,11 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
// this also test overlap between two periods
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
usleep(10000);
usleep(100000);
$event->start();
usleep(10000);
usleep(100000);
$event->ensureStopped();
$total = $event->getDuration();
$this->assertTrue($total >= 21 && $total <= 39, $total.' should be 30 (between 21 and 39)');
$this->assertEquals(300, $event->getDuration(), null, self::DELTA);
}
public function testStartTime()
@ -116,10 +115,9 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
usleep(10000);
usleep(100000);
$event->stop();
$start = $event->getStartTime();
$this->assertTrue($start >= 0 && $start <= 20);
$this->assertEquals(0, $event->getStartTime(), null, self::DELTA);
}
public function testEndTime()
@ -133,13 +131,12 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
$event = new StopwatchEvent(microtime(true) * 1000);
$event->start();
usleep(10000);
usleep(100000);
$event->stop();
$event->start();
usleep(10000);
usleep(100000);
$event->stop();
$end = $event->getEndTime();
$this->assertTrue($end >= 11 && $end <= 29, $end.' should be 20 (between 11 and 29)');
$this->assertEquals(200, $event->getEndTime(), null, self::DELTA);
}
/**

14
src/Symfony/Component/Stopwatch/Tests/StopwatchTest.php
View File

@ -20,6 +20,8 @@ use Symfony\Component\Stopwatch\Stopwatch;
*/
class StopwatchTest extends \PHPUnit_Framework_TestCase
{
const DELTA = 20;
public function testStart()
{
$stopwatch = new Stopwatch();
@ -33,26 +35,24 @@ class StopwatchTest extends \PHPUnit_Framework_TestCase
{
$stopwatch = new Stopwatch();
$stopwatch->start('foo', 'cat');
usleep(20000);
usleep(200000);
$event = $stopwatch->stop('foo');
$this->assertInstanceof('Symfony\Component\Stopwatch\StopwatchEvent', $event);
$total = $event->getDuration();
$this->assertTrue($total > 10 && $total <= 29, $total.' should be 20 (between 10 and 29)');
$this->assertEquals(200, $event->getDuration(), null, self::DELTA);
}
public function testLap()
{
$stopwatch = new Stopwatch();
$stopwatch->start('foo', 'cat');
usleep(10000);
usleep(100000);
$event = $stopwatch->lap('foo');
usleep(10000);
usleep(100000);
$stopwatch->stop('foo');
$this->assertInstanceof('Symfony\Component\Stopwatch\StopwatchEvent', $event);
$total = $event->getDuration();
$this->assertTrue($total > 10 && $total <= 29, $total.' should be 20 (between 10 and 29)');
$this->assertEquals(200, $event->getDuration(), null, self::DELTA);
}
/**