diff --git a/.azure-pipelines/steps/run-tests-windows.yml b/.azure-pipelines/steps/run-tests-windows.yml index 39eaa3b7..2378d5ee 100644 --- a/.azure-pipelines/steps/run-tests-windows.yml +++ b/.azure-pipelines/steps/run-tests-windows.yml @@ -46,7 +46,7 @@ steps: - script: | git submodule sync git submodule update --init --recursive - pipenv run pytest -ra -n 4 --junit-xml=junit/test-results.xml --fulltrace tests/ + pipenv run pytest -ra -n 4 --junit-xml=junit/test-results.xml --fulltrace --timeout=60 tests/ failOnStderr: false displayName: Run integration tests env: diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 610953cc..fe3de6d9 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -80,4 +80,4 @@ jobs: PYTHONIOENCODING: 'utf-8' GIT_SSH_COMMAND: ssh -o StrictHostKeyChecking=accept-new -o CheckHostIP=no run: | - pipenv run pytest -ra -n 4 --fulltrace tests + pipenv run pytest -ra -n 4 --fulltrace --timeout=60 tests diff --git a/tests/integration/conftest.py b/tests/integration/conftest.py index 4940fb57..710c9644 100644 --- a/tests/integration/conftest.py +++ b/tests/integration/conftest.py @@ -217,12 +217,10 @@ def isolate(create_tmpdir): # Ignore PIPENV_ACTIVE so that it works as under a bare environment. os.environ.pop("PIPENV_ACTIVE", None) os.environ.pop("VIRTUAL_ENV", None) - global WE_HAVE_GITHUB_SSH_KEYS - WE_HAVE_GITHUB_SSH_KEYS = check_github_ssh() WE_HAVE_INTERNET = check_internet() -WE_HAVE_GITHUB_SSH_KEYS = check_github_ssh() +WE_HAVE_GITHUB_SSH_KEYS = False class _Pipfile(object):