Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ISC Open Source Projects
Kea
Commits
f24dff69
Commit
f24dff69
authored
Jun 03, 2013
by
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/bin/xfrin/tests/xfrin_test.py
View file @
f24dff69
...
...
@@ -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
...
...
src/bin/xfrin/xfrin.py.in
View file @
f24dff69
...
...
@@ -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')
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment