Merge branch 'ondrej/dont-fail-system-test-on-missing-pytest-v9_16' into 'v9_16'

Add prereq.sh script to the shutdown system test

See merge request isc-projects/bind9!3796
This commit is contained in:
Ondřej Surý
2020-07-03 07:22:00 +00:00
2 changed files with 37 additions and 0 deletions

View File

@@ -0,0 +1,36 @@
#!/bin/sh
#
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
#
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#
# See the COPYRIGHT file distributed with this work for additional
# information regarding copyright ownership.
SYSTEMTESTTOP=..
. $SYSTEMTESTTOP/conf.sh
if test -n "$PYTHON"
then
if $PYTHON -c "import pytest" 2> /dev/null
then
:
else
echo_i "This test requires the pytest framework." >&2
fi
if $PYTHON -c "import dns" 2> /dev/null
then
:
else
echo_i "This test requires the dnspython module." >&2
exit 1
fi
else
echo_i "This test requires Python, the pytest framework and the dnspython module." >&2
exit 1
fi
exit 0

View File

@@ -963,6 +963,7 @@
./bin/tests/system/sfcache/tests.sh SH 2014,2016,2017,2018,2019,2020
./bin/tests/system/shutdown/clean.sh SH 2020
./bin/tests/system/shutdown/conftest.py PYTHON 2020
./bin/tests/system/shutdown/prereq.sh SH 2020
./bin/tests/system/shutdown/setup.sh SH 2020
./bin/tests/system/shutdown/tests-shutdown.py PYTHON-BIN 2020
./bin/tests/system/smartsign/clean.sh SH 2010,2012,2014,2016,2018,2019,2020