diff --git a/src/Symfony/Component/Process/Tests/AbstractProcessTest.php b/src/Symfony/Component/Process/Tests/AbstractProcessTest.php index 9b6b3611dacb..4b2cf43e6731 100644 --- 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 index 0f6bf52b71c3..252098ec4c6d 100644 --- 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(); } /**