Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/Spork/Batch/BatchJob.php
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,12 @@ public function __invoke()

$results = array();
foreach ($forks as $fork) {
$results = array_merge($results, $fork->getResult());
$exitStatus = $fork->getExitStatus();
if (0 !== $exitStatus) {
// Propagate erroneous state
exit($exitStatus);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The state is indeed propagated but what happens if a child fork throws an exception? Would be very nice to know what exactly went wrong. Or do child forks in that case print the message to stderr?

}
$results = array_merge($results, (array) $fork->getResult());
}

return $results;
Expand Down
73 changes: 73 additions & 0 deletions tests/Spork/Test/Batch/BatchJobTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
<?php

namespace Spork\Test\Batch;

class BatchJobTest extends \PHPUnit_Framework_TestCase
{
public function testErrorPropagation()
{
$manager = new \Spork\ProcessManager();
$batch = $manager->createBatchJob(range(1, 5));

$expectedExitStatus = 20;

$failingClosure = function ($data) use ($expectedExitStatus) {
// Simple condition to simulate only one point of failure
if (3 === $data) {
exit($expectedExitStatus);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we rather have a case throwing an exception in the closure ? This seems a more sensible use case.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exceptions are indeed more sensible use cases. But this way we cannot test the correctness of the exit status.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stof I just added a new test case when the closure throws an exception.

}

exit(0);
};

$promise = $batch->execute($failingClosure);

$promise->wait();

$success = null;

$promise->done(function () use (& $success) {
$success = true;
});

$promise->fail(function () use (& $success) {
$success = false;
});

$this->assertFalse($success, 'Promise should fail');

$actualExitStatus = $promise->getExitStatus();

$this->assertEquals($expectedExitStatus, $actualExitStatus, 'Parent process exit status should match the child one');
}

public function testExitStatusIsZeroOnSuccess()
{
$manager = new \Spork\ProcessManager();
$batch = $manager->createBatchJob(range(1, 5));

$simpleClosure = function () {
exit(0);
};

$promise = $batch->execute($simpleClosure);

$promise->wait();

$success = null;

$promise->done(function () use (& $success) {
$success = true;
});

$promise->fail(function () use (& $success) {
$success = false;
});

$this->assertTrue($success, 'Promise should be successful');

$actualExitStatus = $promise->getExitStatus();

$this->assertEquals(0, $actualExitStatus, 'When the promise is successful the exit status should be zero');
}
}