From: Pavel Boldin Date: Mon, 19 Aug 2013 02:05:53 +0000 (+0400) Subject: bind-add-zone: fix for tests context X-Git-Tag: rec-3.6.0-rc1~440^2~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1b1fba53db20602422a8649d7f3521ec427aa28d;p=pdns bind-add-zone: fix for tests context --- diff --git a/regression-tests/add-zone/command b/regression-tests/add-zone/command index bffa60e2d..7ca768f34 100755 --- a/regression-tests/add-zone/command +++ b/regression-tests/add-zone/command @@ -1,4 +1,9 @@ -#!/bin/sh +#!/bin/bash + +if [ "${context:0:4}" != "bind" ]; then + exit 0 +fi + cleandig ns1.addzone.com A cleandig ns1.test.com A sleep 2 diff --git a/regression-tests/add-zone/expected_result b/regression-tests/add-zone/expected_result index e531b86ce..e69de29bb 100644 --- a/regression-tests/add-zone/expected_result +++ b/regression-tests/add-zone/expected_result @@ -1,42 +0,0 @@ -1 . IN NS 518400 a.root-servers.net. -1 . IN NS 518400 b.root-servers.net. -1 . IN NS 518400 c.root-servers.net. -1 . IN NS 518400 d.root-servers.net. -1 . IN NS 518400 e.root-servers.net. -1 . IN NS 518400 f.root-servers.net. -1 . IN NS 518400 g.root-servers.net. -1 . IN NS 518400 h.root-servers.net. -1 . IN NS 518400 i.root-servers.net. -1 . IN NS 518400 j.root-servers.net. -1 . IN NS 518400 k.root-servers.net. -1 . IN NS 518400 l.root-servers.net. -1 . IN NS 518400 m.root-servers.net. -2 a.root-servers.net. IN A 3600000 198.41.0.4 -2 b.root-servers.net. IN A 3600000 192.228.79.201 -2 c.root-servers.net. IN A 3600000 192.33.4.12 -2 d.root-servers.net. IN A 3600000 199.7.91.13 -2 e.root-servers.net. IN A 3600000 192.203.230.10 -2 f.root-servers.net. IN A 3600000 192.5.5.241 -2 g.root-servers.net. IN A 3600000 192.112.36.4 -2 h.root-servers.net. IN A 3600000 128.63.2.53 -2 i.root-servers.net. IN A 3600000 192.36.148.17 -2 j.root-servers.net. IN A 3600000 192.58.128.30 -2 k.root-servers.net. IN A 3600000 193.0.14.129 -2 l.root-servers.net. IN A 3600000 198.32.64.12 -2 m.root-servers.net. IN A 3600000 202.12.27.33 -Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 -Reply to question for qname='ns1.addzone.com.', qtype=A -0 ns1.test.com. IN A 3600 1.1.1.1 -Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 -Reply to question for qname='ns1.test.com.', qtype=A -Loaded zone addzone.com from addzone.com -1 -Already loaded -Rcode: 2, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 -Reply to question for qname='ns1.addzone.com.', qtype=A -0 ns1.addzone.com. IN A 3600 1.1.1.5 -Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 -Reply to question for qname='ns1.addzone.com.', qtype=A -0 ns1.test.com. IN A 3600 1.1.1.1 -Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 -Reply to question for qname='ns1.test.com.', qtype=A diff --git a/regression-tests/add-zone/expected_result.bind b/regression-tests/add-zone/expected_result.bind new file mode 100644 index 000000000..e531b86ce --- /dev/null +++ b/regression-tests/add-zone/expected_result.bind @@ -0,0 +1,42 @@ +1 . IN NS 518400 a.root-servers.net. +1 . IN NS 518400 b.root-servers.net. +1 . IN NS 518400 c.root-servers.net. +1 . IN NS 518400 d.root-servers.net. +1 . IN NS 518400 e.root-servers.net. +1 . IN NS 518400 f.root-servers.net. +1 . IN NS 518400 g.root-servers.net. +1 . IN NS 518400 h.root-servers.net. +1 . IN NS 518400 i.root-servers.net. +1 . IN NS 518400 j.root-servers.net. +1 . IN NS 518400 k.root-servers.net. +1 . IN NS 518400 l.root-servers.net. +1 . IN NS 518400 m.root-servers.net. +2 a.root-servers.net. IN A 3600000 198.41.0.4 +2 b.root-servers.net. IN A 3600000 192.228.79.201 +2 c.root-servers.net. IN A 3600000 192.33.4.12 +2 d.root-servers.net. IN A 3600000 199.7.91.13 +2 e.root-servers.net. IN A 3600000 192.203.230.10 +2 f.root-servers.net. IN A 3600000 192.5.5.241 +2 g.root-servers.net. IN A 3600000 192.112.36.4 +2 h.root-servers.net. IN A 3600000 128.63.2.53 +2 i.root-servers.net. IN A 3600000 192.36.148.17 +2 j.root-servers.net. IN A 3600000 192.58.128.30 +2 k.root-servers.net. IN A 3600000 193.0.14.129 +2 l.root-servers.net. IN A 3600000 198.32.64.12 +2 m.root-servers.net. IN A 3600000 202.12.27.33 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 0, opcode: 0 +Reply to question for qname='ns1.addzone.com.', qtype=A +0 ns1.test.com. IN A 3600 1.1.1.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.test.com.', qtype=A +Loaded zone addzone.com from addzone.com +1 +Already loaded +Rcode: 2, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.addzone.com.', qtype=A +0 ns1.addzone.com. IN A 3600 1.1.1.5 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.addzone.com.', qtype=A +0 ns1.test.com. IN A 3600 1.1.1.1 +Rcode: 0, RD: 0, QR: 1, TC: 0, AA: 1, opcode: 0 +Reply to question for qname='ns1.test.com.', qtype=A diff --git a/regression-tests/add-zone/skip.presigned b/regression-tests/add-zone/skip.presigned new file mode 100644 index 000000000..e69de29bb