danog/process
1
0
Fork 0
mirror of https://github.com/danog/process.git synced 2024-11-26 12:14:43 +01:00
Code Issues Projects Releases Wiki Activity

Wait until process starts to make streams available

Browse Source 
The process runners can be simplified in the future with this change without breaking BC.
This commit is contained in:
Aaron Piotrowski 2018-10-15 09:47:28 -05:00
parent 8ec002633b
commit b71e5c0544
No known key found for this signature in database
GPG Key ID: ADD1EF783EDE9EEB
2 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Process.php
View File

@ -235,8 +235,8 @@ class Process
*/
public function getStdin(): ProcessOutputStream
{
if (!$this->handle) {
throw new StatusError("Process has not been started.");
if (!$this->handle || $this->handle->status === ProcessStatus::STARTING) {
throw new StatusError("Process has not been started or has not completed starting.");
}
return $this->handle->stdin;
@ -249,8 +249,8 @@ class Process
*/
public function getStdout(): ProcessInputStream
{
if (!$this->handle) {
throw new StatusError("Process has not been started.");
if (!$this->handle || $this->handle->status === ProcessStatus::STARTING) {
throw new StatusError("Process has not been started or has not completed starting.");
}
return $this->handle->stdout;
@ -263,8 +263,8 @@ class Process
*/
public function getStderr(): ProcessInputStream
{
if (!$this->handle) {
throw new StatusError("Process has not been started.");
if (!$this->handle || $this->handle->status === ProcessStatus::STARTING) {
throw new StatusError("Process has not been started or has not completed starting.");
}
return $this->handle->stderr;

22
test/ProcessTest.php
View File

@ -31,7 +31,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(\DIRECTORY_SEPARATOR === "\\" ? "cmd /c exit 42" : "exit 42");
$process->start();
yield $process->start();
$promise = $process->join();
$this->assertTrue($process->isRunning());
@ -46,7 +46,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(\DIRECTORY_SEPARATOR === "\\" ? "cmd /c exit 42" : "exit 42");
$process->start();
yield $process->start();
$code = yield $process->join();
@ -106,7 +106,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(self::CMD_PROCESS);
$process->start();
yield $process->start();
$this->assertInstanceOf(ProcessOutputStream::class, $process->getStdin());
yield $process->join();
});
@ -116,7 +116,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(self::CMD_PROCESS);
$process->start();
yield $process->start();
$this->assertInstanceOf(ProcessInputStream::class, $process->getStdout());
yield $process->join();
});
@ -126,7 +126,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(self::CMD_PROCESS);
$process->start();
yield $process->start();
$this->assertInstanceOf(ProcessInputStream::class, $process->getStderr());
yield $process->join();
});
@ -140,7 +140,7 @@ class ProcessTest extends TestCase
'PATH' => \getenv('PATH'),
'SystemRoot' => \getenv('SystemRoot') ?: '', // required on Windows for process wrapper
]);
$process->start();
yield $process->start();
$this->assertSame('foobar', $process->getEnv()['test']);
yield $process->join();
});
@ -158,7 +158,7 @@ class ProcessTest extends TestCase
/**
* @expectedException \Amp\Process\StatusError
* @expectedExceptionMessage Process has not been started.
* @expectedExceptionMessage Process has not been started or has not completed starting.
*/
public function testGetStdinIsStatusError()
{
@ -168,7 +168,7 @@ class ProcessTest extends TestCase
/**
* @expectedException \Amp\Process\StatusError
* @expectedExceptionMessage Process has not been started.
* @expectedExceptionMessage Process has not been started or has not completed starting.
*/
public function testGetStdoutIsStatusError()
{
@ -178,7 +178,7 @@ class ProcessTest extends TestCase
/**
* @expectedException \Amp\Process\StatusError
* @expectedExceptionMessage Process has not been started.
* @expectedExceptionMessage Process has not been started or has not completed starting.
*/
public function testGetStderrIsStatusError()
{
@ -336,7 +336,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(["php", __DIR__ . "/bin/worker.php"]);
$process->start();
yield $process->start();
$process->getStdin()->write("exit 2");
$this->assertSame("..", yield $process->getStdout()->read());
@ -349,7 +349,7 @@ class ProcessTest extends TestCase
{
Loop::run(function () {
$process = new Process(["php", __DIR__ . "/bin/worker.php"]);
$process->start();
yield $process->start();
$count = 128 * 1024 + 1;
$process->getStdin()->write("exit " . $count);