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

[Process] Fix for #8754 (Timed-out processes are successful)

Browse Source
This commit is contained in:
Romain Neutron 2013-08-14 17:41:18 +02:00 committed by Fabien Potencier
parent 4af7276f89
commit fa01e6b4d3
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Symfony/Component/Process/Process.php
View File

@ -646,9 +646,9 @@ class Process
$timeoutMicro = microtime(true) + $timeout;
if ($this->isRunning()) {
proc_terminate($this->process);
while ($this->isRunning() && microtime(true) < $timeoutMicro) {
do {
usleep(1000);
}
} while ($this->isRunning() && microtime(true) < $timeoutMicro);
if ($this->isRunning() && !$this->isSigchildEnabled()) {
if (null !== $signal || defined('SIGKILL')) {

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

@ -444,6 +444,7 @@ abstract class AbstractProcessTest extends \PHPUnit_Framework_TestCase
$duration = microtime(true) - $start;
$this->assertLessThan($timeout + $precision, $duration);
$this->assertFalse($process->isSuccessful());
}
public function testGetPid()

8
src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
View File

@ -61,6 +61,14 @@ class SigchildDisabledProcessTest extends AbstractProcessTest
parent::testProcessWithoutTermSignal();
}
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/
public function testCheckTimeoutOnStartedProcess()
{
parent::testCheckTimeoutOnStartedProcess();
}
/**
* @expectedException \Symfony\Component\Process\Exception\RuntimeException
*/