Skip to content

Commit 67f5d2d

Browse files
committed
Merge branch '7.0' into 7.1
* 7.0: [Process] Fix failing tests causing segfaults
2 parents 1c0721a + 7a74847 commit 67f5d2d

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

Tests/ProcessTest.php

+2-2
Original file line numberDiff line numberDiff line change
@@ -1625,7 +1625,7 @@ public function testFailingProcessWithMultipleCallsToProcGetStatus()
16251625
*/
16261626
public function testLongRunningProcessWithMultipleCallsToProcGetStatus()
16271627
{
1628-
$process = $this->getProcess('php -r "sleep(1); echo \'done\';"');
1628+
$process = $this->getProcess('sleep 1 && echo "done" && php -r "exit(0);"');
16291629
$process->start(static function () use ($process) {
16301630
return $process->isRunning();
16311631
});
@@ -1640,7 +1640,7 @@ public function testLongRunningProcessWithMultipleCallsToProcGetStatus()
16401640
*/
16411641
public function testLongRunningProcessWithMultipleCallsToProcGetStatusError()
16421642
{
1643-
$process = $this->getProcess('php -r "sleep(1); echo \'failure\'; exit(123);"');
1643+
$process = $this->getProcess('sleep 1 && echo "failure" && php -r "exit(123);"');
16441644
$process->start(static function () use ($process) {
16451645
return $process->isRunning();
16461646
});

0 commit comments

Comments
 (0)