Fix integration tests to actually run (#514)

guzzle · Jun 8, 2022 · a07b9fd · a07b9fd
1 parent 2d92607
commit a07b9fd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 20 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   composer-normalize:
     name: Composer Normalize
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   build-lowest-version:
     name: Build lowest version
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Set up PHP
@@ -26,11 +26,11 @@ jobs:
         run: composer update --no-interaction --prefer-stable --prefer-lowest --no-progress
 
       - name: Run tests
-        run: make test
+        run: vendor/bin/phpunit --testsuite "Guzzle PSR-7 Unit Test Suite"
 
   build:
     name: Build
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 10
       matrix:
@@ -47,12 +47,8 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Mimic PHP 8.0
-        run: composer config platform.php 8.0.999
-        if: matrix.php > 8
-
       - name: Install dependencies
         run: composer update --no-interaction --no-progress
 
       - name: Run tests
-        run: make test
+        run: vendor/bin/phpunit --testsuite "Guzzle PSR-7 Unit Test Suite"
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -10,7 +10,7 @@ jobs:
 
   build:
     name: Test
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 10
       matrix:
@@ -26,17 +26,18 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v3
 
-      - name: Mimic PHP 8.0
-        run: composer config platform.php 8.0.999
-        if: matrix.php > 8
-
       - name: Install dependencies
         run: composer update --no-interaction --no-progress
 
       - name: Start server
         run: php -S 127.0.0.1:10002 tests/Integration/server.php &
 
-      - name: Run tests
+      - name: Run Guzzle tests
+        env:
+          TEST_SERVER: 127.0.0.1:10002
+        run: vendor/bin/phpunit --testsuite "Guzzle PSR-7 Integration Test Suite"
+
+      - name: Run Interop tests
         env:
           TEST_SERVER: 127.0.0.1:10002
-        run: ./vendor/bin/phpunit --testsuite Integration
+        run: vendor/bin/phpunit --testsuite "PSR-17 Integration Test Suite"
diff --git a/.github/workflows/static.yml b/.github/workflows/static.yml
@@ -9,7 +9,7 @@ on:
 jobs:
   phpstan:
     name: PHPStan
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code
@@ -34,7 +34,7 @@ jobs:
 
   php-cs-fixer:
     name: PHP-CS-Fixer
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code
@@ -59,7 +59,7 @@ jobs:
 
   psalm:
     name: Psalm
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
 
     steps:
       - name: Checkout code

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -14,7 +14,7 @@
         <testsuite name="Guzzle PSR-7 Integration Test Suite">
             <directory>tests/Integration</directory>
         </testsuite>
-        <testsuite name="PSR-7 Integration Test Suite">
+        <testsuite name="PSR-17 Integration Test Suite">
             <directory>./vendor/http-interop/http-factory-tests/test</directory>
         </testsuite>
     </testsuites>