[Process] Fix Process test suite

symfony · Mar 31, 2014 · a42fbd7 · a42fbd7
1 parent 7cc8e7a
commit a42fbd7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php
@@ -313,10 +313,15 @@ public function testPTYCommand()
 
     public function testMustRun()
     {
-        $process = $this->getProcess('echo "foo"');
+        $process = $this->getProcess('echo foo');
 
         $this->assertSame($process, $process->mustRun());
-        $this->assertEquals("foo\n", $process->getOutput());
+        $this->assertEquals("foo".PHP_EOL, $process->getOutput());
+    }
+
+    public function testSuccessfulMustRunHasCorrectExitCode()
+    {
+        $process = $this->getProcess('echo foo')->mustRun();
         $this->assertEquals(0, $process->getExitCode());
     }
 
@@ -612,7 +617,7 @@ public function testCheckTimeoutOnStartedProcess()
      */
     public function testIdleTimeout()
     {
-        $process = $this->getProcess('sleep 3');
+        $process = $this->getProcess('php -r "sleep(3);"');
         $process->setTimeout(10);
         $process->setIdleTimeout(0.5);
 
@@ -632,7 +637,7 @@ public function testIdleTimeout()
      */
     public function testIdleTimeoutNotExceededWhenOutputIsSent()
     {
-        $process = $this->getProcess('echo "foo" && sleep 1 && echo "foo" && sleep 1 && echo "foo" && sleep 1');
+        $process = $this->getProcess('php -r "echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); echo \'foo\'; sleep(1); "');
         $process->setTimeout(2);
         $process->setIdleTimeout(1.5);
 

diff --git a/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php b/src/Symfony/Component/Process/Tests/SigchildDisabledProcessTest.php
@@ -51,11 +51,11 @@ public function testExitCodeCommandFailed()
 
     /**
      * @expectedException \Symfony\Component\Process\Exception\RuntimeException
-     * @expectedExceptionMessage his PHP has been compiled with --enable-sigchild. Term signal can not be retrieved.
+     * @expectedExceptionMessage This PHP has been compiled with --enable-sigchild. You must use setEnhanceSigchildCompatibility() to use this method.
      */
-    public function testMustRun()
+    public function testSuccessfulMustRunHasCorrectExitCode()
     {
-        parent::testMustRun();
+        parent::testSuccessfulMustRunHasCorrectExitCode();
     }
 
     /**