Update test suite to future-proof base images

clue · clue · commit a8cf6ac45d12 · 2022-10-12T11:51:39.000+02:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -11,8 +11,8 @@ jobs:
     strategy:
       matrix:
         os:
-          - ubuntu-20.04
-          - windows-2019
+          - ubuntu-22.04
+          - windows-2022
         php:
           - 8.2
           - 8.1
@@ -27,7 +27,7 @@ jobs:
           - 5.4
           - 5.3
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php }}
@@ -53,13 +53,14 @@ jobs:
 
   PHPUnit-hhvm:
     name: PHPUnit (HHVM)
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v2
-      - uses: azjezz/setup-hhvm@v1
+      - uses: actions/checkout@v3
+      - run: curl -O https://getcomposer.org/download/latest-2.2.x/composer.phar
+      - uses: docker://hhvm/hhvm:3.30-lts-latest
+        with:
+          args: hhvm composer.phar install
+      - uses: docker://hhvm/hhvm:3.30-lts-latest
         with:
-          version: lts-3.30
-      - run: composer self-update --2.2 # downgrade Composer for HHVM
-      - run: hhvm $(which composer) install
-      - run: hhvm vendor/bin/phpunit
+          args: hhvm vendor/bin/phpunit
diff --git a/tests/TcpConnectorTest.php b/tests/TcpConnectorTest.php
@@ -109,7 +109,7 @@ public function connectionToTcpServerShouldFailIfFileDescriptorsAreExceeded()
         }
 
         // each file descriptor takes ~600 bytes of memory, so skip test if this would exceed memory_limit
-        if ($ulimit * 600 > $memory) {
+        if ($ulimit * 600 > $memory || $ulimit > 100000) {
             $this->markTestSkipped('Test requires ~' . round($ulimit * 600 / 1024 / 1024) . '/' . round($memory / 1024 / 1024) . ' MiB memory with ' . $ulimit . ' file descriptors');
         }
 

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ public function connectionToTcpServerShouldFailIfFileDescriptorsAreExceeded()`
`109`	`109`	`}`
`110`	`110`
`111`	`111`	`// each file descriptor takes ~600 bytes of memory, so skip test if this would exceed memory_limit`
`112`		`- if ($ulimit * 600 > $memory) {`
	`112`	`+ if ($ulimit * 600 > $memory \|\| $ulimit > 100000) {`
`113`	`113`	`$this->markTestSkipped('Test requires ~' . round($ulimit * 600 / 1024 / 1024) . '/' . round($memory / 1024 / 1024) . ' MiB memory with ' . $ulimit . ' file descriptors');`
`114`	`114`	`}`
`115`	`115`