minor #44643 Skip transient tests on macos (nicolas-grekas)

nicolas-grekas · nicolas-grekas · commit d6710c1e19c0 · 2021-12-15T14:41:26.000+01:00
This PR was merged into the 4.4 branch. Discussion ---------- Skip transient tests on macos | Q | A | ------------- | --- | Branch? | 4.4 | Bug fix? | no | New feature? | no | Deprecations? | no | Tickets | - | License | MIT | Doc PR | - Commits ------- 880988c Skip transient tests on macos
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
@@ -74,7 +74,7 @@ jobs:
           ([ -d "$COMPOSER_HOME" ] || mkdir "$COMPOSER_HOME") && cp .github/composer-config.json "$COMPOSER_HOME/config.json"
 
           echo COLUMNS=120 >> $GITHUB_ENV
-          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data" >> $GITHUB_ENV
+          echo PHPUNIT="$(pwd)/phpunit --exclude-group tty,benchmark,intl-data$([[ ${{ matrix.os }} = macos* ]] && echo ',transient-on-macos')" >> $GITHUB_ENV
           echo COMPOSER_UP='composer update --no-progress --ansi' >> $GITHUB_ENV
 
           SYMFONY_VERSIONS=$(git ls-remote -q --heads | cut -f2 | grep -o '/[1-9][0-9]*\.[0-9].*' | sort -V)
diff --git a/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php b/src/Symfony/Contracts/HttpClient/Test/HttpClientTestCase.php
@@ -810,19 +810,22 @@ public function testTimeoutWithActiveConcurrentStream()
         }
     }
 
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnInitialize()
     {
         $p1 = TestHttpServer::start(8067);
-        $p2 = TestHttpServer::start(8078);
+        $p2 = TestHttpServer::start(8077);
 
         $client = $this->getHttpClient(__FUNCTION__);
         $start = microtime(true);
         $responses = [];
 
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
 
         try {
             foreach ($responses as $response) {
@@ -843,19 +846,22 @@ public function testTimeoutOnInitialize()
         }
     }
 
+    /**
+     * @group transient-on-macos
+     */
     public function testTimeoutOnDestruct()
     {
         $p1 = TestHttpServer::start(8067);
-        $p2 = TestHttpServer::start(8078);
+        $p2 = TestHttpServer::start(8077);
 
         $client = $this->getHttpClient(__FUNCTION__);
         $start = microtime(true);
         $responses = [];
 
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
         $responses[] = $client->request('GET', 'http://localhost:8067/timeout-header', ['timeout' => 0.25]);
-        $responses[] = $client->request('GET', 'http://localhost:8078/timeout-header', ['timeout' => 0.25]);
+        $responses[] = $client->request('GET', 'http://localhost:8077/timeout-header', ['timeout' => 0.25]);
 
         try {
             while ($response = array_shift($responses)) {
