Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
25 changes: 19 additions & 6 deletions src/Restarters/PcovRestarter.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,8 @@ private function restart(string $projectRoot, array $arguments): void
$env = $this->inheritEnv();
$env[self::ENV_RESTARTED] = '1';

$command = array_merge(
[PHP_BINARY, '-d', 'pcov.directory='.$projectRoot],
array_values($arguments),
);

$proc = @proc_open(
$command,
$this->command($projectRoot, $arguments),
[STDIN, STDOUT, STDERR],
$pipes,
null,
Expand All @@ -74,6 +69,24 @@ private function restart(string $projectRoot, array $arguments): void
exit($exitCode === -1 ? 1 : $exitCode);
}

/**
* @param array<int, string> $arguments
* @return list<string>
*/
private function command(string $projectRoot, array $arguments): array
{
return array_merge(
[
PHP_BINARY,
'-d',
'memory_limit='.ini_get('memory_limit'),
'-d',
'pcov.directory='.$projectRoot,
],
array_values($arguments),
);
}

/**
* @return array<string, string>
*/
Expand Down
5 changes: 4 additions & 1 deletion tests/.snapshots/success.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2051,6 +2051,9 @@
✓ preset invalid name
✓ preset → myFramework

PASS Tests\Unit\Restarters\PcovRestarter
✓ it preserves the active memory limit in the restarted process

PASS Tests\Unit\Support\Arr
✓ last → it should return false for an empty arary
✓ last → it should return the last element for an array with a single element
Expand Down Expand Up @@ -2234,4 +2237,4 @@
✓ pass with dataset with ('my-datas-set-value')
✓ within describe → pass with dataset with ('my-datas-set-value')

Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 40 todos, 35 skipped, 1581 passed (3434 assertions)
Tests: 2 deprecated, 4 warnings, 5 incomplete, 2 notices, 40 todos, 35 skipped, 1582 passed (3435 assertions)
1 change: 1 addition & 0 deletions tests/Features/Tia.php
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
'PARATEST' => 0,
'PAO_DISABLE' => '1',
'HOME' => $home,
'CI_DEFAULT_BRANCH' => $branch,
],
);

Expand Down
26 changes: 26 additions & 0 deletions tests/Unit/Restarters/PcovRestarter.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php

declare(strict_types=1);

use Pest\Restarters\PcovRestarter;
use Symfony\Component\Process\Process;

it('preserves the active memory limit in the restarted process', function (): void {
$originalMemoryLimit = ini_get('memory_limit');

try {
ini_set('memory_limit', '1234M');

$command = new ReflectionMethod(PcovRestarter::class, 'command')
->invoke(new PcovRestarter, __DIR__, ['-r', 'fwrite(STDOUT, (string) ini_get("memory_limit"));']);

assert(is_array($command));

$process = new Process($command);
$process->mustRun();

expect($process->getOutput())->toBe('1234M');
} finally {
ini_set('memory_limit', (string) $originalMemoryLimit);
}
});
4 changes: 2 additions & 2 deletions tests/Visual/Parallel.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@
$file = file_get_contents(__FILE__);
$file = preg_replace(
'/\$expected = \'.*?\';/',
"\$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1563 passed (3379 assertions)';",
"\$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1564 passed (3380 assertions)';",
$file,
);
file_put_contents(__FILE__, $file);
}

$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1563 passed (3379 assertions)';
$expected = '2 deprecated, 4 warnings, 5 incomplete, 3 notices, 40 todos, 27 skipped, 1564 passed (3380 assertions)';

expect($output)
->toContain("Tests: {$expected}")
Expand Down