From 754c7de1e91eeb28c6d3766900ead0c3e44fdb85 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 28 Apr 2024 01:51:28 +0200 Subject: Merging upstream version 1:9.16.48. Signed-off-by: Daniel Baumann --- bin/tests/system/shutdown/prereq.sh | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) (limited to 'bin/tests/system/shutdown') diff --git a/bin/tests/system/shutdown/prereq.sh b/bin/tests/system/shutdown/prereq.sh index 9f46512..826a3f8 100755 --- a/bin/tests/system/shutdown/prereq.sh +++ b/bin/tests/system/shutdown/prereq.sh @@ -14,25 +14,22 @@ 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 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 + 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 -- cgit v1.2.3