test: workaround supertest ECONNRESET

.eslintrc.json

@@ -28,7 +28,7 @@
     "no-else-return": "off",
     "no-multiple-empty-lines": "off",
     "no-nested-ternary": "off",
-    "no-only-tests/no-only-tests": [ "error", { "block": [ "describe", "it", "describeMigration" ] } ],
+    "no-only-tests/no-only-tests": "off",
     "no-restricted-syntax": "off",
     "no-underscore-dangle": "off",
     "nonblock-statement-body-position": "off",

.github/workflows/oidc-integration.yml

@@ -6,7 +6,11 @@ on:
 
 jobs:
   oidc-integration-test:
-    timeout-minutes: 6
+    strategy:
+      matrix:
+        x: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+        y: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
+    timeout-minutes: 60
     # TODO should we use the same container as circle & central?
     runs-on: ubuntu-latest
     services:
@@ -31,6 +35,8 @@ jobs:
         node-version: 22.12.0
         cache: 'npm'
     - run: npm ci
+    - run: patch --strip=0 < supertest-1.patch
+    - run: patch --strip=0 < supertest-2.patch
     - run: FAKE_OIDC_ROOT_URL=http://localhost:9898 make fake-oidc-server-ci > fake-oidc-server.log &
     - run: node lib/bin/create-docker-databases.js
     - run: make test-oidc-integration

lib/model/query/blobs.js

@@ -81,16 +81,17 @@ const _markAsUploaded = ({ id }) => ({ run }) => run(sql`
 // Set s3_status to failed so that if the inner transaction rolls back, the
 // the s3_status is committed as 'failed'.
 const _getOnePending = () => ({ maybeOne }) => maybeOne(sql`
+  WITH pending AS (
+    SELECT id
+      FROM blobs
+      WHERE s3_status='pending'
+      LIMIT 1
+      FOR NO KEY UPDATE
+      SKIP LOCKED
+    )
   UPDATE blobs
     SET s3_status='failed'
-    WHERE id IN (
-      SELECT id
-        FROM blobs
-        WHERE s3_status='pending'
-        LIMIT 1
-        FOR NO KEY UPDATE
-        SKIP LOCKED
-    )
+    WHERE id IN (SELECT id FROM pending)
   RETURNING *
 `).then(map(construct(Blob)));