BIND 10 trac1455, updated. d8f2ae1c3e671294f01e737edc71bc78eb0e7d1f [1455] refactor tests
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed May 23 15:16:40 UTC 2012
The branch, trac1455 has been updated
via d8f2ae1c3e671294f01e737edc71bc78eb0e7d1f (commit)
via 7a9e74102707dce06920e94bf168b92aad894d5d (commit)
from be101587eb7b91a7e6604db12dbeb8725390a940 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d8f2ae1c3e671294f01e737edc71bc78eb0e7d1f
Author: Jelte Jansen <jelte at isc.org>
Date: Wed May 23 17:16:13 2012 +0200
[1455] refactor tests
share duplicate test code, remove now unnecessary helpers
commit 7a9e74102707dce06920e94bf168b92aad894d5d
Author: Jelte Jansen <jelte at isc.org>
Date: Wed May 23 16:33:28 2012 +0200
[1455] aesthetic changes from review
whitespace, comments, log messages, typos
-----------------------------------------------------------------------
Summary of changes:
src/lib/dns/python/pydnspp.cc | 2 +-
src/lib/dns/rrset.cc | 2 +-
src/lib/python/isc/ddns/libddns_messages.mes | 12 +-
src/lib/python/isc/ddns/tests/session_tests.py | 287 ++++++------------------
4 files changed, 78 insertions(+), 225 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/dns/python/pydnspp.cc b/src/lib/dns/python/pydnspp.cc
index 82f4e63..23ed463 100644
--- a/src/lib/dns/python/pydnspp.cc
+++ b/src/lib/dns/python/pydnspp.cc
@@ -230,7 +230,7 @@ initModulePart_Name(PyObject* mod) {
Py_BuildValue("I", NameComparisonResult::EQUAL));
addClassVariable(name_comparison_result_type, "COMMONANCESTOR",
Py_BuildValue("I", NameComparisonResult::COMMONANCESTOR));
-
+
PyModule_AddObject(mod, "NameComparisonResult",
reinterpret_cast<PyObject*>(&name_comparison_result_type));
diff --git a/src/lib/dns/rrset.cc b/src/lib/dns/rrset.cc
index 9f4bf82..4d8e262 100644
--- a/src/lib/dns/rrset.cc
+++ b/src/lib/dns/rrset.cc
@@ -51,7 +51,7 @@ AbstractRRset::toText() const {
getClass() != RRClass::NONE()) {
isc_throw(EmptyRRset, "toText() is attempted for an empty RRset");
}
-
+
s += getName().toText() + " " + getTTL().toText() + " " +
getClass().toText() + " " + getType().toText() + "\n";
return (s);
diff --git a/src/lib/python/isc/ddns/libddns_messages.mes b/src/lib/python/isc/ddns/libddns_messages.mes
index 9af9501..190a6bf 100644
--- a/src/lib/python/isc/ddns/libddns_messages.mes
+++ b/src/lib/python/isc/ddns/libddns_messages.mes
@@ -51,7 +51,8 @@ nonterminals.
A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
was not satisfied is shown. The client is sent an error response with the
given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'Name is not in use'.
+From RFC2136:
Name is not in use. No RR of any type is owned by a
specified NAME. Note that this prerequisite IS satisfied by
empty nonterminals.
@@ -66,7 +67,8 @@ the client.
A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
was not satisfied is shown. The client is sent an error response with the
given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset does not exist'.
+From RFC2136:
RRset does not exist. No RRs with a specified NAME and TYPE
(in the zone and class denoted by the Zone Section) can exist.
@@ -74,7 +76,8 @@ RRset does not exist. No RRs with a specified NAME and TYPE
A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
was not satisfied is shown. The client is sent an error response with the
given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset exists (value independent)'.
+From RFC2136:
RRset exists (value dependent). A set of RRs with a
specified NAME and TYPE exists and has the same members
with the same RDATAs as the RRset specified here in this
@@ -84,7 +87,8 @@ Section.
A DNS UPDATE prerequisite was not satisfied. The specific prerequisite that
was not satisfied is shown. The client is sent an error response with the
given rcode.
-In this case, the specific prerequisite is ''. From RFC2136:
+In this case, the specific prerequisite is 'RRset exists (value dependent)'.
+From RFC2136:
RRset exists (value independent). At least one RR with a
specified NAME and TYPE (in the zone and class specified by
the Zone Section) must exist.
diff --git a/src/lib/python/isc/ddns/tests/session_tests.py b/src/lib/python/isc/ddns/tests/session_tests.py
index 1391040..9dcbf37 100644
--- a/src/lib/python/isc/ddns/tests/session_tests.py
+++ b/src/lib/python/isc/ddns/tests/session_tests.py
@@ -150,195 +150,158 @@ class SessionTest(unittest.TestCase):
# zone class doesn't match
self.check_notauth(Name('example.org'), RRClass.CH())
- def __check_prerequisite_exists(self, expected, client, rrset):
- '''helper method for test_check_prerequisite_exists. This function
- does nothing but call __check_prerequisite_exists, and checks
- the result value.
- expected is either True or False.
- (since the check_prerequisite is a 'private' method, and calling
- it is a bit ugly, this helper method helps keeping the actual
- test code cleaner).
+ def __prereq_helper(self, method, expected, rrset):
+ '''Calls the given method with self.__datasrc_client
+ and the given rrset, and compares the return value.
+ Function does not do much but makes the code look nicer'''
+ self.assertEqual(expected, method(self.__datasrc_client, rrset))
+
+ def __check_prerequisite_exists_combined(self, method, expected):
+ '''shared code for the checks for the very similar (but reversed
+ in behaviour) methods __prereq_rrset_exists and
+ __prereq_rrset_does_not_exist.
'''
- self.assertEqual(expected,
- self.__session._UpdateSession__prereq_rrset_exists(
- client, rrset))
-
- def __check_prerequisite_exists_value(self, expected, client, rrset):
- '''Similar to __check_prerequisite_exists(), but for checking
- the result of __check_prerequisite_rrset_exists_value().
- '''
- self.assertEqual(expected,
- self.__session.
- _UpdateSession__prereq_rrset_exists_value(client, rrset))
-
- def __check_prerequisite_does_not_exist(self, expected, client, rrset):
- '''Similar to __check_prerequisite_exists(), but for checking
- the result of __check_prerequisite_rrset_does_not_exist().
- '''
- self.assertEqual(expected,
- self.__session.
- _UpdateSession__prereq_rrset_does_not_exist(client, rrset))
-
- def __check_prerequisite_name_in_use(self, expected, client, rrset):
- '''Similar to __check_prerequisite_exists(), but for checking
- the result of __check_prerequisite_name_in_use().
- '''
- self.assertEqual(expected,
- self.__session.
- _UpdateSession__prereq_name_in_use(client, rrset))
-
- def __check_prerequisite_name_not_in_use(self, expected, client, rrset):
- '''Similar to __check_prerequisite_exists(), but for checking
- the result of __check_prerequisite_name_in_use().
- '''
- self.assertEqual(expected,
- self.__session.
- _UpdateSession__prereq_name_not_in_use(client, rrset))
- def test_check_prerequisite_exists(self):
# Basic existence checks
# www.example.org should have an A, but not an MX
rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.MX(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
# example.org should have an MX, but not an A
rrset = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.MX(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
# Also check the case where the name does not even exist
rrset = isc.dns.RRset(isc.dns.Name("doesnotexist.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
# Wildcard expansion should not be applied, but literal matches
# should work
rrset = isc.dns.RRset(isc.dns.Name("foo.wildcard.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("*.wildcard.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
# Likewise, CNAME directly should match, but what it points to should
# not
rrset = isc.dns.RRset(isc.dns.Name("cname.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("cname.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.CNAME(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
# And also make sure a delegation (itself) is not treated as existing
# data
rrset = isc.dns.RRset(isc.dns.Name("foo.sub.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(False, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, not expected, rrset)
# But the delegation data itself should match
rrset = isc.dns.RRset(isc.dns.Name("sub.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.NS(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
# As should glue
rrset = isc.dns.RRset(isc.dns.Name("ns.sub.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists(True, self.__datasrc_client, rrset)
+ self.__prereq_helper(method, expected, rrset)
+
+ def test_check_prerequisite_exists(self):
+ method = self.__session._UpdateSession__prereq_rrset_exists
+ self.__check_prerequisite_exists_combined(method, True)
+
+ def test_check_prerequisite_does_not_exist(self):
+ method = self.__session._UpdateSession__prereq_rrset_does_not_exist
+ self.__check_prerequisite_exists_combined(method, False)
def test_check_prerequisite_exists_value(self):
+ method = self.__session._UpdateSession__prereq_rrset_exists_value
+
rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.A(),
isc.dns.RRTTL(0))
# empty one should not match
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
# When the rdata is added, it should match
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.A(),
isc.dns.RRClass.IN(),
"192.0.2.1"))
- self.__check_prerequisite_exists_value(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, True, rrset)
# But adding more should not
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.A(),
isc.dns.RRClass.IN(),
"192.0.2.2"))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
# Also test one with more than one RR
rrset = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.NS(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns1.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns2.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns3.example.org."))
- self.__check_prerequisite_exists_value(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, True, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns4.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
# Repeat that, but try a different order of Rdata addition
rrset = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.IN(), isc.dns.RRType.NS(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns3.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns2.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns1.example.org."))
- self.__check_prerequisite_exists_value(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, True, rrset)
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.NS(),
isc.dns.RRClass.IN(),
"ns4.example.org."))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
# and test one where the name does not even exist
rrset = isc.dns.RRset(isc.dns.Name("doesnotexist.example.org"),
@@ -347,169 +310,55 @@ class SessionTest(unittest.TestCase):
rrset.add_rdata(isc.dns.Rdata(isc.dns.RRType.A(),
isc.dns.RRClass.IN(),
"192.0.2.1"))
- self.__check_prerequisite_exists_value(False, self.__datasrc_client,
- rrset)
-
- def test_check_prerequisite_does_not_exist(self):
- # This is essentially the same as test_check_prerequisite_exists(),
- # but with the opposite resulting values
- # www.example.org should have an A, but not an MX
- rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
- rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.MX(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(True, self.__datasrc_client,
- rrset)
-
- # example.org should have an MX, but not an A
- rrset = isc.dns.RRset(isc.dns.Name("example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.MX(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
- rrset = isc.dns.RRset(isc.dns.Name("example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(True, self.__datasrc_client,
- rrset)
-
- # Wildcard expansion should not be applied, but literal matches
- # should work
- rrset = isc.dns.RRset(isc.dns.Name("foo.wildcard.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(True, self.__datasrc_client,
- rrset)
-
- rrset = isc.dns.RRset(isc.dns.Name("*.wildcard.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
-
- # Likewise, CNAME directly should match, but what it points to should
- # not
- rrset = isc.dns.RRset(isc.dns.Name("cname.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(True, self.__datasrc_client,
- rrset)
-
- rrset = isc.dns.RRset(isc.dns.Name("cname.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.CNAME(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
-
- # And also make sure a delegation (itself) is not treated as existing
- # data
- rrset = isc.dns.RRset(isc.dns.Name("foo.sub.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(True, self.__datasrc_client,
- rrset)
- # But the delegation data itself should match
- rrset = isc.dns.RRset(isc.dns.Name("sub.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.NS(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
- # As should glue
- rrset = isc.dns.RRset(isc.dns.Name("ns.sub.example.org"),
- isc.dns.RRClass.IN(), isc.dns.RRType.A(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_does_not_exist(False, self.__datasrc_client,
- rrset)
-
- def test_check_prerequisite_name_in_use(self):
- rrset = isc.dns.RRset(isc.dns.Name("example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(True, self.__datasrc_client,
- rrset)
-
- rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, False, rrset)
- rrset = isc.dns.RRset(isc.dns.Name("doesnotexist.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(False, self.__datasrc_client,
- rrset)
-
- rrset = isc.dns.RRset(isc.dns.Name("belowdelegation.sub.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(False, self.__datasrc_client,
- rrset)
-
- rrset = isc.dns.RRset(isc.dns.Name("foo.wildcard.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(False, self.__datasrc_client,
- rrset)
-
- # empty nonterminal should not match
- rrset = isc.dns.RRset(isc.dns.Name("nonterminal.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(False, self.__datasrc_client,
- rrset)
- rrset = isc.dns.RRset(isc.dns.Name("empty.nonterminal.example.org"),
- isc.dns.RRClass.ANY(), isc.dns.RRType.ANY(),
- isc.dns.RRTTL(0))
- self.__check_prerequisite_name_in_use(True, self.__datasrc_client,
- rrset)
-
- def test_check_prerequisite_name_not_in_use(self):
+ def __check_prerequisite_name_in_use_combined(self, method, expected):
+ '''shared code for the checks for the very similar (but reversed
+ in behaviour) methods __prereq_name_in_use and
+ __prereq_name_not_in_use
+ '''
rrset = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("www.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("doesnotexist.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, not expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("belowdelegation.sub.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, not expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("foo.wildcard.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, not expected, rrset)
# empty nonterminal should not match
rrset = isc.dns.RRset(isc.dns.Name("nonterminal.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(True, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, not expected, rrset)
rrset = isc.dns.RRset(isc.dns.Name("empty.nonterminal.example.org"),
isc.dns.RRClass.NONE(), isc.dns.RRType.ANY(),
isc.dns.RRTTL(0))
- self.__check_prerequisite_name_not_in_use(False, self.__datasrc_client,
- rrset)
+ self.__prereq_helper(method, expected, rrset)
+
+ def test_check_prerequisite_name_in_use(self):
+ method = self.__session._UpdateSession__prereq_name_in_use
+ self.__check_prerequisite_name_in_use_combined(method, True)
+
+ def test_check_prerequisite_name_not_in_use(self):
+ method = self.__session._UpdateSession__prereq_name_not_in_use
+ self.__check_prerequisite_name_in_use_combined(method, False)
def check_prerequisite_result(self, expected, prerequisites):
'''Helper method for checking the result of a prerequisite check;
@@ -522,7 +371,7 @@ class SessionTest(unittest.TestCase):
session = UpdateSession(msg, msg_data, TEST_CLIENT4, zconfig)
# compare the to_text output of the rcodes (nicer error messages)
# This call itself should also be done by handle(),
- # but just for better failures, it is first called on itw own
+ # but just for better failures, it is first called on its own
self.assertEqual(expected.to_text(),
session._UpdateSession__check_prerequisites(self.__datasrc_client,
TEST_ZONE_NAME,
@@ -543,7 +392,7 @@ class SessionTest(unittest.TestCase):
# It does test all types of prerequisites, but it does not test
# every possible result for those types (those are tested above,
# in the specific prerequisite type tests)
-
+
# Let's first define a number of prereq's that should succeed
rrset_exists_yes = isc.dns.RRset(isc.dns.Name("example.org"),
isc.dns.RRClass.ANY(),
More information about the bind10-changes
mailing list