diff options
| author | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-13 01:24:44 +0300 |
|---|---|---|
| committer | thecalcaholic <6317548+theCalcaholic@users.noreply.github.com> | 2022-07-13 01:24:44 +0300 |
| commit | e4d66e5c2299250a5aea9970b26a522a65946ef9 (patch) | |
| tree | a2df551e31508f388587f993db3b9530edd46829 | |
| parent | 85a4c7e0e28e03264a2bada2ac81012a612ff3ae (diff) | |
build-docker.yml: Increase timeout for cross arch integration tests
| -rw-r--r-- | .github/workflows/build-docker.yml | 4 | ||||
| -rwxr-xr-x | tests/activation_tests.py | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml index 316863a1..9799c237 100644 --- a/.github/workflows/build-docker.yml +++ b/.github/workflows/build-docker.yml @@ -82,7 +82,9 @@ jobs: - name: Integration Tests working-directory: ./tests run: | - python activation_tests.py --no-gui localhost 8443 4443 || { + cmd=(python activation_tests.py --no-gui localhost 8443 4443) + [[ "${{ matrix.arch }}" == "x86" ]] || cmd+=(--timeout 300) + "${cmd[@]}" || { tail -n 20 geckodriver.log >&2 || true echo "=======================" echo "Activation test failed!" diff --git a/tests/activation_tests.py b/tests/activation_tests.py index 1d34cba5..1164ea4d 100755 --- a/tests/activation_tests.py +++ b/tests/activation_tests.py @@ -32,7 +32,6 @@ from selenium.common.exceptions import TimeoutException suite_name = "activation tests" test_cfg = 'test_cfg.txt' test_log = 'test_log.txt' -wait_timeout = 120 class tc: @@ -90,7 +89,7 @@ def signal_handler(sig, frame): sys.exit(0) -def test_activation(IP, nc_port, admin_port, options): +def test_activation(IP, nc_port, admin_port, options, wait_timeout=120): """ Activation process checks""" # activation page @@ -157,6 +156,7 @@ if __name__ == "__main__": usage() sys.exit(2) + arg_timeout = 120 options = Options() for opt, arg in opts: if opt in ('-h', '--help'): @@ -164,6 +164,8 @@ if __name__ == "__main__": sys.exit(2) elif opt == '--no-gui': options.headless = True + elif opt in ('-t', '--timeout'): + arg_timeout = int(arg) else: usage() sys.exit(2) @@ -176,7 +178,7 @@ if __name__ == "__main__": print("Activation tests " + tc.yellow + IP + tc.normal) print("---------------------------") - test_activation(IP, nc_port, admin_port, options) + test_activation(IP, nc_port, admin_port, options, arg_timeout) # License # |