mirror of
https://github.com/isc-projects/bind9.git
synced 2026-05-26 19:34:04 -04:00
Rewrite spf system test to pytest
(cherry picked from commit e67d770432)
This commit is contained in:
parent
24fd30f7eb
commit
dfe31f7395
3 changed files with 32 additions and 60 deletions
|
|
@ -1,46 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# SPDX-License-Identifier: MPL-2.0
|
||||
#
|
||||
# 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 https://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
set -e
|
||||
|
||||
. ../conf.sh
|
||||
|
||||
n=1
|
||||
status=0
|
||||
|
||||
# Wait until all zones are loaded before checking SPF related logs
|
||||
for i in 1 2 3 4 5 6 7 8 9 10; do
|
||||
grep "all zones loaded" ns1/named.run >/dev/null && break
|
||||
sleep 1
|
||||
done
|
||||
|
||||
echo_i "checking that SPF warnings have been correctly generated ($n)"
|
||||
ret=0
|
||||
|
||||
grep "zone spf/IN: loaded serial 0" ns1/named.run >/dev/null || ret=1
|
||||
grep "'y.spf' found type SPF" ns1/named.run >/dev/null || ret=1
|
||||
grep "'spf' found type SPF" ns1/named.run >/dev/null && ret=1
|
||||
|
||||
grep "zone warn/IN: loaded serial 0" ns1/named.run >/dev/null || ret=1
|
||||
grep "'y.warn' found type SPF" ns1/named.run >/dev/null || ret=1
|
||||
grep "'warn' found type SPF" ns1/named.run >/dev/null && ret=1
|
||||
|
||||
grep "zone nowarn/IN: loaded serial 0" ns1/named.run >/dev/null || ret=1
|
||||
grep "'y.nowarn' found type SPF" ns1/named.run >/dev/null && ret=1
|
||||
grep "'nowarn' found type SPF" ns1/named.run >/dev/null && ret=1
|
||||
n=$((n + 1))
|
||||
if [ $ret != 0 ]; then echo_i "failed"; fi
|
||||
status=$((status + ret))
|
||||
|
||||
echo_i "exit status: $status"
|
||||
[ $status -eq 0 ] || exit 1
|
||||
|
|
@ -1,14 +0,0 @@
|
|||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# SPDX-License-Identifier: MPL-2.0
|
||||
#
|
||||
# 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 https://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
|
||||
def test_spf(run_tests_sh):
|
||||
run_tests_sh()
|
||||
32
bin/tests/system/spf/tests_spf_zones.py
Normal file
32
bin/tests/system/spf/tests_spf_zones.py
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
# Copyright (C) Internet Systems Consortium, Inc. ("ISC")
|
||||
#
|
||||
# SPDX-License-Identifier: MPL-2.0
|
||||
#
|
||||
# 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 https://mozilla.org/MPL/2.0/.
|
||||
#
|
||||
# See the COPYRIGHT file distributed with this work for additional
|
||||
# information regarding copyright ownership.
|
||||
|
||||
import pytest
|
||||
|
||||
|
||||
@pytest.mark.requires_zones_loaded("ns1")
|
||||
def test_spf_log(servers):
|
||||
for msg in (
|
||||
"zone spf/IN: 'y.spf' found type SPF record but no SPF TXT record found",
|
||||
"zone warn/IN: 'y.warn' found type SPF record but no SPF TXT record found",
|
||||
"zone spf/IN: loaded serial 0",
|
||||
"zone warn/IN: loaded serial 0",
|
||||
"zone nowarn/IN: loaded serial 0",
|
||||
):
|
||||
servers["ns1"].log.expect(msg)
|
||||
|
||||
for msg in (
|
||||
"zone nowarn/IN: 'y.nowarn' found type SPF record but no SPF TXT record found",
|
||||
"zone spf/IN: 'spf' found type SPF record but no SPF TXT record found",
|
||||
"zone warn/IN: 'warn' found type SPF record but no SPF TXT record found",
|
||||
"zone nowarn/IN: 'nowarn' found type SPF record but no SPF TXT record found",
|
||||
):
|
||||
servers["ns1"].log.prohibit(msg)
|
||||
Loading…
Reference in a new issue