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

symfony · Aug 14, 2013 · fa01e6b · fa01e6b
1 parent 4af7276
commit fa01e6b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/src/Symfony/Component/Process/Process.php b/src/Symfony/Component/Process/Process.php
@@ -646,9 +646,9 @@ public function stop($timeout = 10, $signal = null)
         $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')) {

diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -444,6 +444,7 @@ public function testCheckTimeoutOnStartedProcess()
         $duration = microtime(true) - $start;
 
         $this->assertLessThan($timeout + $precision, $duration);
+        $this->assertFalse($process->isSuccessful());
     }
 
     public function testGetPid()

diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
@@ -61,6 +61,14 @@ public function testProcessWithoutTermSignal()
         parent::testProcessWithoutTermSignal();
     }
 
+    /**
+     * @expectedException \Symfony\Component\Process\Exception\RuntimeException
+     */
+    public function testCheckTimeoutOnStartedProcess()
+    {
+        parent::testCheckTimeoutOnStartedProcess();
+    }
+
     /**
      * @expectedException \Symfony\Component\Process\Exception\RuntimeException
      */