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

minor #14247 [Process] Fix volatile test (nicolas-grekas) 

This PR was merged into the 2.6 branch.

Discussion
----------

[Process] Fix volatile test

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | #14078
| License       | MIT
| Doc PR        | -

This PR hopefully fixes this remaining and most frequent volatile test.

Commits
-------

dae1942 [Process] Fix volatile test
This commit is contained in:
Fabien Potencier 2015-04-08 12:03:04 +02:00
parent 0430d2095f dae19422ec
commit b66c9347cb
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Symfony/Component/Process/Tests/AbstractProcessTest.php
View File

@ -800,9 +800,6 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$this->assertFalse($process->isSuccessful());
}
/**
* @group idle-timeout
*/
public function testIdleTimeout()
{
$process = $this->getProcess('php -r "sleep(3);"');
@ -820,21 +817,18 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
}
}
/**
* @group idle-timeout
*/
public function testIdleTimeoutNotExceededWhenOutputIsSent()
{
$process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
$process = $this->getProcess(sprintf('php -r %s', escapeshellarg('$n = 30; while ($n--) {echo "foo\n"; usleep(100000); }')));
$process->setTimeout(2);
$process->setIdleTimeout(1.5);
$process->setIdleTimeout(1);
try {
$process->run();
$this->fail('A timeout exception was expected.');
} catch (ProcessTimedOutException $ex) {
$this->assertTrue($ex->isGeneralTimeout());
$this->assertFalse($ex->isIdleTimeout());
$this->assertTrue($ex->isGeneralTimeout(), 'A general timeout is expected.');
$this->assertFalse($ex->isIdleTimeout(), 'No idle timeout is expected.');
$this->assertEquals(2, $ex->getExceededTimeout());
}
}

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

@ -76,6 +76,7 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
$event->start();
usleep(100000);
$event->stop();
usleep(50000);
$event->start();
usleep(100000);
$event->stop();
@ -93,6 +94,7 @@ class StopwatchEventTest extends \PHPUnit_Framework_TestCase
$event->start();
usleep(100000);
$event->stop();
usleep(50000);
$event->start();
usleep(100000);
$this->assertEquals(100, $event->getDuration(), null, self::DELTA);