Skip to content

Commit fe14eb7

Browse files
committed
Merge branch '5.1' into 5.x
* 5.1: [Filesystem] Check if failed unlink was caused by permission denied fix APCu installation for the nightly build job skip Vulcain-based tests if the binary cannot be executed
2 parents 9f221c5 + bc1db73 commit fe14eb7

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

Tests/HttpClientTestCase.php

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,14 @@ private static function startVulcain(HttpClientInterface $client)
302302
sleep('\\' === \DIRECTORY_SEPARATOR ? 10 : 1);
303303

304304
if (!$process->isRunning()) {
305+
if ('\\' !== \DIRECTORY_SEPARATOR && 127 === $process->getExitCode()) {
306+
self::markTestSkipped('vulcain binary is missing');
307+
}
308+
309+
if ('\\' !== \DIRECTORY_SEPARATOR && 126 === $process->getExitCode()) {
310+
self::markTestSkipped('vulcain binary is not executable');
311+
}
312+
305313
self::markTestSkipped((new ProcessFailedException($process))->getMessage());
306314
}
307315

0 commit comments

Comments
 (0)