From 7a9b086d569bf1a20940af887389e582aceb7c18 Mon Sep 17 00:00:00 2001
From: Dany Maillard <danymaillard93b@gmail.com>
Date: Mon, 3 Apr 2017 13:58:31 +0200
Subject: [PATCH] Fold Travis CI output by component

---
 .github/travis_fold.sh                           | 16 ++++++++++++++++
 .travis.yml                                      | 12 ++++++------
 .../DataCollector/DoctrineDataCollectorTest.php  |  1 +
 3 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100755 .github/travis_fold.sh

diff --git a/.github/travis_fold.sh b/.github/travis_fold.sh
new file mode 100755
index 0000000000..d0430aec58
--- /dev/null
+++ b/.github/travis_fold.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+#######################################
+# Fold Travis CI output
+# Arguments:
+#   $1 fold name
+#   $2 command to execute
+#######################################
+tfold () {
+    FOLD=$(echo $1 | tr / .)
+    echo "travis_fold:start:$FOLD"
+    echo -e "\\e[34m$1\\e[0m"
+    sh -c "$2" && echo "travis_fold:end:$FOLD"
+}
+
+export -f tfold
diff --git a/.travis.yml b/.travis.yml
index 7205200d85..fe6e2f8ce8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -82,13 +82,13 @@ install:
     - if [[ ! $skip ]]; then composer update --no-suggest; fi
     - if [[ ! $skip ]]; then ./phpunit install; fi
     - if [[ ! $skip && ! $PHP = hhvm* ]]; then php -i; else hhvm --php -r 'print_r($_SERVER);print_r(ini_get_all());'; fi
+    - . .github/travis_fold.sh
 
 script:
-    - REPORT=' && echo -e "\\e[32mOK\\e[0m {}\\n\\n" || (echo -e "\\e[41mKO\\e[0m {}\\n\\n" && $(exit 1))'
     - if [[ $skip ]]; then echo -e "\\n\\e[1;34mIntermediate PHP version $PHP is skipped for pull requests.\\e[0m"; fi
-    - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu '$PHPUNIT --exclude-group tty,benchmark,intl-data {}'"$REPORT"; fi
-    - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo -e "\\nRunning tests requiring tty"; $PHPUNIT --group tty; fi
+    - if [[ ! $deps && ! $PHP = hhvm* ]]; then echo "$COMPONENTS" | parallel --gnu -k 'tfold {}.PHPUnit "$PHPUNIT --exclude-group tty,benchmark,intl-data {}"'; fi
+    - if [[ ! $deps && ! $PHP = hhvm* ]]; then tfold PHPUnit.tty "$PHPUNIT --group tty"; fi
     - if [[ ! $deps && $PHP = hhvm* ]]; then $PHPUNIT --exclude-group benchmark,intl-data; fi
-    - if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'echo "\\nPHP --enable-sigchild enhanced={}" && ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/'; fi
-    - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --no-suggest --ansi; $PHPUNIT --exclude-group tty,benchmark,intl-data'$LEGACY"$REPORT"; fi
-    - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -j10% 'cd {}; composer update --no-progress --no-suggest --ansi --prefer-lowest --prefer-stable; $PHPUNIT --exclude-group tty,benchmark,intl-data'"$REPORT"; fi
+    - if [[ ! $deps && $PHP = ${MIN_PHP%.*} ]]; then echo -e "1\\n0" | xargs -I{} sh -c 'tfold PHPUnit.sigchild "ENHANCE_SIGCHLD={} php-$MIN_PHP/sapi/cli/php .phpunit/phpunit-4.8/phpunit --colors=always src/Symfony/Component/Process/"'; fi
+    - if [[ $deps = high ]]; then echo "$COMPONENTS" | parallel --gnu -k -j10% 'cd {}; tfold {}.composer "composer update --no-progress --no-suggest --ansi 2>&1"; tfold {}.PHPUnit "$PHPUNIT --exclude-group tty,benchmark,intl-data$LEGACY"'; fi
+    - if [[ $deps = low ]]; then echo "$COMPONENTS" | parallel --gnu -k -j10% 'cd {}; tfold {}.composer "composer update --no-progress --no-suggest --ansi --prefer-lowest --prefer-stable 2>&1"; tfold {}.PHPUnit "$PHPUNIT --exclude-group tty,benchmark,intl-data"'; fi
diff --git a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
index 3059f8aba0..cf5cee90dd 100644
--- a/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
+++ b/src/Symfony/Bridge/Doctrine/Tests/DataCollector/DoctrineDataCollectorTest.php
@@ -24,6 +24,7 @@ class DoctrineDataCollectorTest extends TestCase
         $c = $this->createCollector(array());
         $c->collect(new Request(), new Response());
         $this->assertEquals(array('default' => 'doctrine.dbal.default_connection'), $c->getConnections());
+        $this->assertTrue(false);
     }
 
     public function testCollectManagers()