upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-28 04:34:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rewrite run.sh to invoke pytest in a system test directory

Browse source 
Previously, run.sh tried to use pytest's -k option for test selection.
The downside was that this filter expression matched any test case with
the given substring, rather than executing a system test suite with the
given name.

The run.sh has been rewritten to invoke pytest from a system test
directory instead. This behaves more consistently with the run.sh from
legacy system test framework.

run.sh is now also a shell script to avoid confusion regarding its
file extension.

(cherry picked from commit 1aaefc9cf4)
This commit is contained in:
Tom Krizek 2023-05-09 13:32:13 +02:00
parent de206d6436
commit 6811f9704a
No known key found for this signature in database
GPG key ID: 01623B9B652A20A7
1 changed files with 10 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
bin/tests/system/run.sh
View file

@ -1,4 +1,4 @@
#!/usr/bin/python3
#!/bin/sh
#
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
@ -12,80 +12,16 @@
# information regarding copyright ownership.
#
# Run system test using the pytest runner. This is a simple wrapper around
# pytest for convenience.
# Run a single system test using the pytest runner. This is a simple wrapper
# around pytest for convenience.
#
import argparse
import sys
import time
if [ -z "$1" ] || [ ! -d "$1" ]; then
echo "Usage: $0 system_test_dir [pytest_args]"
exit 2
fi
import pytest
system_test_dir="$1"
shift
def into_pytest_args(in_args):
args = []
if in_args.expression is None:
try:
import xdist
except ImportError:
pass
else:
# running all tests - execute in parallel
args.extend(["-n", "auto"])
else:
args.extend(["-k", in_args.expression])
if in_args.noclean:
args.append("--noclean")
if in_args.keep:
print(
"ERROR -k / --keep option not implemented.\n"
"Please contact QA with your use-case and use ./legacy.run.sh in the meantime."
)
sys.exit(1)
return args
def main():
print(
"----- WARNING -----\n"
"Using pytest system test runner\n\n"
'Please consider invoking "pytest" directly for more control:\n'
" single test: pytest -k dns64\n"
" parallel tests: pytest -n auto\n\n"
"Alternately, use ./legacy.run.sh for the legacy system test runner.\n"
)
parser = argparse.ArgumentParser(
description="Wrapper script for launching system tests"
)
parser.add_argument(
"--noclean",
action="store_true",
help="don't clean tmpdir after test run",
)
parser.add_argument(
"-k",
"--keep",
action="store_true",
help="unused - not implemented",
)
parser.add_argument(
"expression",
type=str,
nargs="?",
help="select which test(s) to run",
)
args = into_pytest_args(parser.parse_args())
print(f"$ pytest {' '.join(args)}\n" "---------------------------\n")
time.sleep(2) # force the user to stare at the warning message
sys.exit(pytest.main(args))
if __name__ == "__main__":
main()
# vim: set filetype=python :
(cd "$system_test_dir" || exit 2 ; /usr/bin/env python3 -m pytest "$@")