minor #15993 [ci] Display fastest results first when running tests in parallel (nicolas-grekas)

This PR was merged into the 2.3 branch.

Discussion
----------

[ci] Display fastest results first when running tests in parallel

| Q             | A
| ------------- | ---
| Bug fix?      | no
| New feature?  | no
| BC breaks?    | no
| Deprecations? | no
| Tests pass?   | yes
| Fixed tickets | -
| License       | MIT
| Doc PR        | -

Keeping order prevents seeing failures early as they happen. I propose to display tests results asap instead.
Best viewed with: https://github.com/symfony/symfony/pull/15993/files?w=1

Commits
-------

3d6c864 [ci] Display fastest results first when running tests in parallel
This commit is contained in:
Fabien Potencier 2015-09-30 07:57:50 +02:00
commit d8dc8f27fd
3 changed files with 46 additions and 36 deletions

View File

@ -44,7 +44,7 @@ install:
- if [ "$deps" != "no" ]; then php .travis.php $TRAVIS_COMMIT_RANGE $TRAVIS_BRANCH $COMPONENTS; fi;
script:
- if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
- if [ "$deps" = "no" ]; then echo "$COMPONENTS" | parallel --gnu 'echo -e "\\nRunning {} tests"; $PHPUNIT --exclude-group tty,benchmark,intl-data {}'; fi;
- if [ "$deps" = "no" ]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi;
- if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
- if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu --keep-order -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
- if [ "$deps" = "high" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;
- if [ "$deps" = "low" ]; then echo "$COMPONENTS" | parallel --gnu -j10% 'echo -e "\\nRunning {} tests"; cd {}; composer --prefer-source --prefer-lowest --prefer-stable update; $PHPUNIT --exclude-group tty,benchmark,intl-data'; fi;

68
phpunit
View File

@ -33,13 +33,13 @@ $exit = 0;
if (isset($argv[1]) && 'symfony' === $argv[1]) {
// Find Symfony components in plain php for Windows portability
$finder = new RecursiveDirectoryIterator('src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS);
$finder = new RecursiveDirectoryIterator(__DIR__.'/src/Symfony', FilesystemIterator::KEY_AS_FILENAME | FilesystemIterator::UNIX_PATHS);
$finder = new RecursiveIteratorIterator($finder);
$finder->setMaxDepth(3);
array_shift($cmd);
$cmd[0] = "php $PHPUNIT_DIR/phpunit-$PHPUNIT_VERSION/phpunit --colors=always";
$procs = array();
$runningProcs = array();
foreach ($finder as $file => $fileInfo) {
if ('phpunit.xml.dist' === $file) {
@ -50,7 +50,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
$c = escapeshellarg($component);
if ($proc = proc_open(implode(' ', $cmd)." $c > $c/phpunit.stdout 2> $c/phpunit.stderr", array(), $pipes)) {
$procs[$component] = $proc;
$runningProcs[$component] = $proc;
} else {
$exit = 1;
echo "\033[41mKO\033[0m $component\n\n";
@ -59,7 +59,7 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
}
// Fixes for colors support on appveyor
// See http://help.appveyor.com/discussions/suggestions/197-support-ansi-color-codes
// See https://github.com/appveyor/ci/issues/373
$colorFixes = array(
array("S\033[0m\033[0m\033[36m\033[1mS", "E\033[0m\033[0m\033[31m\033[1mE", "I\033[0m\033[0m\033[33m\033[1mI", "F\033[0m\033[0m\033[41m\033[37mF"),
array("SS", "EE", "II", "FF"),
@ -67,36 +67,46 @@ if (isset($argv[1]) && 'symfony' === $argv[1]) {
$colorFixes[0] = array_merge($colorFixes[0], $colorFixes[0]);
$colorFixes[1] = array_merge($colorFixes[1], $colorFixes[1]);
foreach ($procs as $component => $proc) {
$procStatus = proc_close($proc);
foreach (array('out', 'err') as $file) {
$file = "$component/phpunit.std$file";
if ('\\' === DIRECTORY_SEPARATOR) {
$h = fopen($file, 'rb');
while (false !== $line = fgets($h)) {
echo str_replace($colorFixes[0], $colorFixes[1], preg_replace(
'/(\033\[[0-9]++);([0-9]++m)(?:(.)(\033\[0m))?/',
"$1m\033[$2$3$4$4",
$line
));
}
fclose($h);
} else {
readfile($file);
while ($runningProcs) {
usleep(300000);
$terminatedProcs = array();
foreach ($runningProcs as $component => $proc) {
$procStatus = proc_get_status($proc);
if (!$procStatus['running']) {
$terminatedProcs[$component] = $procStatus['exitcode'];
unset($runningProcs[$component]);
proc_close($proc);
}
unlink($file);
}
if ($procStatus) {
$exit = 1;
echo "\033[41mKO\033[0m $component\n\n";
} else {
echo "\033[32mOK\033[0m $component\n\n";
foreach ($terminatedProcs as $component => $procStatus) {
foreach (array('out', 'err') as $file) {
$file = "$component/phpunit.std$file";
if ('\\' === DIRECTORY_SEPARATOR) {
$h = fopen($file, 'rb');
while (false !== $line = fgets($h)) {
echo str_replace($colorFixes[0], $colorFixes[1], preg_replace(
'/(\033\[[0-9]++);([0-9]++m)(?:(.)(\033\[0m))?/',
"$1m\033[$2$3$4$4",
$line
));
}
fclose($h);
} else {
readfile($file);
}
unlink($file);
}
if ($procStatus) {
$exit = 1;
echo "\033[41mKO\033[0m $component\n\n";
} else {
echo "\033[32mOK\033[0m $component\n\n";
}
}
}
} elseif (!isset($argv[1]) || 'install' !== $argv[1]) {
// Run regular phpunit in a subprocess

View File

@ -21,7 +21,7 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
public function testRewindOnFtp()
{
try {
$i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS);
$i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
} catch (\UnexpectedValueException $e) {
$this->markTestSkipped('Unsupported stream "ftp".');
}
@ -37,14 +37,14 @@ class RecursiveDirectoryIteratorTest extends IteratorTestCase
public function testSeekOnFtp()
{
try {
$i = new RecursiveDirectoryIterator('ftp://ftp.mozilla.org/', \RecursiveDirectoryIterator::SKIP_DOTS);
$i = new RecursiveDirectoryIterator('ftp://speedtest.tele2.net/', \RecursiveDirectoryIterator::SKIP_DOTS);
} catch (\UnexpectedValueException $e) {
$this->markTestSkipped('Unsupported stream "ftp".');
}
$contains = array(
'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'README',
'ftp://ftp.mozilla.org'.DIRECTORY_SEPARATOR.'pub',
'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'1000GB.zip',
'ftp://speedtest.tele2.net'.DIRECTORY_SEPARATOR.'100GB.zip',
);
$actual = array();