Merge branch '2.7' into 2.8

nicolas-grekas · nicolas-grekas · commit eb7f2f7443f9 · 2015-12-31T11:59:32.000+01:00
* 2.7:
  [Process] Clean tested process on tear down
diff --git a/src/Symfony/Component/Process/Tests/ProcessTest.php b/src/Symfony/Component/Process/Tests/ProcessTest.php
@@ -24,6 +24,7 @@
 class ProcessTest extends \PHPUnit_Framework_TestCase
 {
     private static $phpBin;
+    private static $process;
     private static $sigchild;
     private static $notEnhancedSigchild = false;
 
@@ -43,6 +44,14 @@ public static function setUpBeforeClass()
         self::$sigchild = false !== strpos(ob_get_clean(), '--enable-sigchild');
     }
 
+    protected function tearDown()
+    {
+        if (self::$process) {
+            self::$process->stop(0);
+            self::$process = null;
+        }
+    }
+
     public function testThatProcessDoesNotThrowWarningDuringRun()
     {
         @trigger_error('Test Error', E_USER_NOTICE);
@@ -123,9 +132,9 @@ public function testAllOutputIsActuallyReadOnTermination()
         $h = new \ReflectionProperty($p, 'process');
         $h->setAccessible(true);
         $h = $h->getValue($p);
-        $s = proc_get_status($h);
+        $s = @proc_get_status($h);
 
-        while ($s['running']) {
+        while (!empty($s['running'])) {
             usleep(1000);
             $s = proc_get_status($h);
         }
@@ -1277,7 +1286,11 @@ private function getProcess($commandline, $cwd = null, array $env = null, $input
             }
         }
 
-        return $process;
+        if (self::$process) {
+            self::$process->stop(0);
+        }
+
+        return self::$process = $process;
     }
 
     private function skipIfNotEnhancedSigchild($expectException = true)
