Skip to content

Commit

Permalink
Merge branch 'mnowak/pytest_rewrite_dialup' into 'main'
Browse files Browse the repository at this point in the history
Rewrite dialup system test to pytest

See merge request isc-projects/bind9!8668
  • Loading branch information
Mno-hime committed Jan 24, 2024
2 parents 5ce1ff5 + bc4c298 commit c92b6fc
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 79 deletions.
2 changes: 1 addition & 1 deletion bin/tests/system/dialup/ns1/named.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ options {
pid-file "named.pid";
listen-on { 10.53.0.1; };
listen-on-v6 { none; };
heartbeat-interval 2;
heartbeat-interval 1;
recursion no;
dnssec-validation no;
};
Expand Down
2 changes: 1 addition & 1 deletion bin/tests/system/dialup/ns2/named.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ options {
pid-file "named.pid";
listen-on { 10.53.0.2; };
listen-on-v6 { none; };
heartbeat-interval 2;
heartbeat-interval 1;
recursion no;
dnssec-validation no;
};
Expand Down
2 changes: 1 addition & 1 deletion bin/tests/system/dialup/ns3/named.conf.in
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ options {
pid-file "named.pid";
listen-on { 10.53.0.3; };
listen-on-v6 { none; };
heartbeat-interval 2;
heartbeat-interval 1;
recursion no;
dnssec-validation no;
};
Expand Down
62 changes: 0 additions & 62 deletions bin/tests/system/dialup/tests.sh

This file was deleted.

33 changes: 33 additions & 0 deletions bin/tests/system/dialup/tests_dialup_zone_transfer.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
# 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

import isctest

import dns.message


@pytest.mark.parametrize("ns", [2, 3])
def test_dialup_zone_transfer(named_port, servers, ns):
msg = dns.message.make_query("example.", "SOA")
# Drop the RD flag from the query
msg.flags -= dns.flags.RD
ns1response = isctest.query.tcp(msg, "10.53.0.1")
with servers[f"ns{ns}"].watch_log_from_here() as watcher:
watcher.wait_for_line(
f"transfer of 'example/IN' from 10.53.0.{ns-1}#{named_port}: Transfer status: success",
timeout=90,
)
response = isctest.query.tcp(msg, f"10.53.0.{ns}")
if response.rcode() != dns.rcode.SERVFAIL:
assert response.answer == ns1response.answer
assert response.authority == ns1response.authority
14 changes: 0 additions & 14 deletions bin/tests/system/dialup/tests_sh_dialup.py

This file was deleted.

0 comments on commit c92b6fc

Please sign in to comment.