From 4cde4871c1d980739d12fa1ed1bdde3446a956a0 Mon Sep 17 00:00:00 2001 From: gpotter2 <10530980+gpotter2@users.noreply.github.com> Date: Mon, 29 Apr 2024 02:15:40 +0200 Subject: [PATCH] Switch to PyPy3.10 in tests --- .github/workflows/unittests.yml | 4 ++-- test/run_tests | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index b8e56968f39..8f92b17faf6 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -91,7 +91,7 @@ jobs: flags: " -K scanner" # PyPy tests: root only - os: ubuntu-latest - python: "pypy3.9" + python: "pypy3.10" mode: root flags: " -K scanner" # Libpcap test @@ -112,7 +112,7 @@ jobs: allow-failure: 'true' flags: " -k scanner" - os: ubuntu-latest - python: "pypy3.9" + python: "pypy3.10" mode: root allow-failure: 'true' flags: " -k scanner" diff --git a/test/run_tests b/test/run_tests index 48c931d9f2d..1ecc29d6f00 100755 --- a/test/run_tests +++ b/test/run_tests @@ -58,7 +58,7 @@ then export SIMPLE_TESTS="true" export PYTHON export DISABLE_COVERAGE=" " - PYVER=$($PYTHON -c "import sys; print('.'.join(sys.version.split('.')[:2]))") + PYVER=$($PYTHON -c "import sys,platform; print(('pypy' if platform.python_implementation() == 'PyPy' else '') + '.'.join(sys.version.split('.')[:2]))") bash ${DIR}/.config/ci/test.sh $PYVER non_root exit $? fi