From 5aeeffe6c7e7ef12856b4d1475054dfb783f8ca1 Mon Sep 17 00:00:00 2001 From: Beatriz Rizental Date: Thu, 19 Jan 2023 18:02:47 +0100 Subject: [PATCH] EXTRA: Only retry functional tests on CI --- .github/workflows/functional_tests.yaml | 6 +++--- .github/workflows/wasm.yaml | 8 ++++---- package.json | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/functional_tests.yaml b/.github/workflows/functional_tests.yaml index 7b947eedf49..32a60974883 100644 --- a/.github/workflows/functional_tests.yaml +++ b/.github/workflows/functional_tests.yaml @@ -23,7 +23,7 @@ jobs: steps: - name: Clone repository uses: actions/checkout@v3 - with: + with: submodules: 'true' - name: Install build dependecies @@ -87,7 +87,7 @@ jobs: functionaltests: name: Functional tests - needs: + needs: - build_test_app runs-on: ubuntu-22.04 timeout-minutes: 45 @@ -143,7 +143,7 @@ jobs: export HEADLESS=yes export TZ=Europe/London mkdir -p $ARTIFACT_DIR - xvfb-run -a npm run functionalTest -- ${{matrix.test.path}} + xvfb-run -a npm run functionalTest -- --retries 3 ${{matrix.test.path}} env: ARTIFACT_DIR: ${{ runner.temp }}/artifacts MVPN_BIN: ./build/dummyvpn diff --git a/.github/workflows/wasm.yaml b/.github/workflows/wasm.yaml index bf50938656b..34491253705 100644 --- a/.github/workflows/wasm.yaml +++ b/.github/workflows/wasm.yaml @@ -26,7 +26,7 @@ jobs: steps: - name: Clone repository uses: actions/checkout@v3 - with: + with: submodules: 'true' - name: Install Qt @@ -122,8 +122,8 @@ jobs: with: name: WebAssembly Build Qt6 # Destination path - path: wasm - + path: wasm + - name: Build addons shell: bash run: ./scripts/addon/generate_all_tests.py -q /opt/$QTVERSION/gcc_64/bin @@ -137,4 +137,4 @@ jobs: command: | export PATH=$GECKOWEBDRIVER:$(npm bin):$PATH export HEADLESS=yes - xvfb-run -a npm run functionalTestWasm -- ${{matrix.test.path}} + xvfb-run -a npm run functionalTestWasm -- --retries 3 ${{matrix.test.path}} diff --git a/package.json b/package.json index e3cd766bf30..f19cf578a4a 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "scripts": { - "functionalTest": "mocha --require ./tests/functional/setupVpn.js --timeout 30000 --retries 3", - "functionalTestWasm": "mocha --require ./tests/functional/setupWasm.js --timeout 30000 --retries 3" + "functionalTest": "mocha --require ./tests/functional/setupVpn.js --timeout 30000", + "functionalTestWasm": "mocha --require ./tests/functional/setupWasm.js --timeout 30000" }, "devDependencies": { "body-parser": "^1.20.0",