try

scality · Dec 5, 2024 · 6932d49 · 6932d49
1 parent 10ead81
commit 6932d49
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -213,9 +213,7 @@ jobs:
         set -o pipefail;
         bash wait_for_local_port.bash 8000 40
         bash wait_for_local_port.bash 81 40
-        bash wait_for_local_port.bash 9991 40
         yarn run multiple_backend_test | tee /tmp/artifacts/${{ github.job }}/tests.log
-        bash wait_for_local_port.bash 9991 40
       env:
         S3_LOCATION_FILE: tests/locationConfig/locationConfigTests.json
     - name: Debug wait
@@ -307,7 +305,7 @@ jobs:
     - name: Debug wait
       uses: ./.github/actions/debug-wait
       timeout-minutes: 60
-      if: always()
+      if: failure() && runner.debug == '1'
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:
@@ -354,7 +352,7 @@ jobs:
     - name: Debug wait
       uses: ./.github/actions/debug-wait
       timeout-minutes: 60
-      if: always()
+      if: failure() && runner.debug == '1'
     - name: Upload logs to artifacts
       uses: scality/action-artifacts@v4
       with:

diff --git a/tests/quota/awsNodeSdk.js b/tests/quota/awsNodeSdk.js
@@ -338,11 +338,18 @@ function multiObjectDelete(bucket, keys, size, callback) {
         };
         mockScuba = scuba;
 
-        before(done => {
+        before(async () => {
             const config = getConfig('default', { signatureVersion: 'v4', maxRetries: 0 });
             s3Client = new S3(config);
             scuba.start();
-            return metadata.setup(err => wait(2000, () => done(err)));
+            await new Promise((resolve, reject) => {
+                metadata.setup(err => {
+                    if (err) {
+                        return reject(err);
+                    }
+                    wait(2000, resolve);
+                });
+            });
         });
 
         afterEach(() => {