Commit f24dff69 authored by JINMEI Tatuya's avatar JINMEI Tatuya
Browse files

[2964] (unrelated) cleanup: removed the check for pydnspp module.

it doesn't make sense in practice and should better be cleaned up.
parent 429d200e
......@@ -1005,7 +1005,7 @@ class TestAXFR(TestXfrinConnection):
def message_has_tsig(data):
# a simple check if the actual data contains a TSIG RR.
# At our level this simple check should suffice; other detailed
# tests regarding the TSIG protocol are done in pydnspp.
# tests regarding the TSIG protocol are done in the isc.dns module.
msg = Message(Message.PARSE)
msg.from_wire(data)
return msg.get_tsig_record() is not None
......@@ -2644,14 +2644,6 @@ class TestXfrin(unittest.TestCase):
self.assertEqual(self.xfr.command_handler("retransfer",
self.args)['result'][0], 1)
def test_command_handler_retransfer_nomodule(self):
dns_module = sys.modules['pydnspp'] # this must exist
del sys.modules['pydnspp']
self.assertEqual(self.xfr.command_handler("retransfer",
self.args)['result'][0], 1)
# sys.modules is global, so we must recover it
sys.modules['pydnspp'] = dns_module
def test_command_handler_retransfer_datasrc_error(self):
# Failure cases due to various errors at the data source (config/data)
# level
......
......@@ -1708,11 +1708,6 @@ class Xfrin:
def xfrin_start(self, zone_name, rrclass, master_addrinfo, tsig_key,
request_ixfr, check_soa=True):
if "pydnspp" not in sys.modules:
return (1,
"xfrin failed, can't load dns message python library: " +
"'pydnspp'")
# check max_transfer_in, else return quota error
if self.recorder.count() >= self._max_transfers_in:
return (1, 'xfrin quota error')
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment