Merge branch 'master' into no-suppress-deprecation

.github/workflows/oidc-e2e.yml

@@ -1,6 +1,8 @@
 name: OIDC e2e tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 env:
   DEBUG: pw:api

.github/workflows/oidc-integration.yml

@@ -1,6 +1,8 @@
 name: OIDC integration tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   oidc-integration-test:

.github/workflows/s3-e2e.yml

@@ -1,6 +1,8 @@
 name: S3 E2E Tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   s3-e2e:

.github/workflows/standard-e2e.yml

@@ -1,6 +1,8 @@
 name: Standard E2E Tests
 
-on: push
+on:
+  push:
+  pull_request:
 
 env:
   LOG_LEVEL: DEBUG

.github/workflows/standard-suite.yml

@@ -1,6 +1,8 @@
 name: Full Standard Test Suite
 
-on: push
+on:
+  push:
+  pull_request:
 
 jobs:
   standard-tests:

test/e2e/s3/test.js

@@ -247,11 +247,7 @@ describe('s3 support', () => {
     // then
     // N.B. These errors are as observed, and demonstrate that the root error is shared
     // with the user.  They are not something to try to retain if implementation changes.
-    await expectRejectionFrom(uploading, new RegExp(
-      'Command failed: exec node lib/bin/s3 upload-pending\n' +
-          '(AggregateError.*)?Error: (connect ECONNREFUSED|read ECONNRESET|socket hang up|write EPIPE)',
-      's',
-    ));
+    await expectRejectionFrom(uploading, /(AggregateError.*)?Error: (connect ECONNREFUSED|read ECONNRESET|socket hang up|write EPIPE)/);
     // and
     await assertNewStatuses({ uploaded: 1, failed: 1 });
   });