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

[1298] corrected comments about the test to match the recent change.

also, commented out now-meaningless tests rather than tweaking them
to let them pass in a superficial manner (we'll discuss this).
parent 681e0e8b
......@@ -1911,7 +1911,7 @@ class TestXfrin(unittest.TestCase):
# try it with a known zone
self.args['master'] = TEST_MASTER_IPV6_ADDRESS
# but use a different address in the actual command
# with a zone configuration that has a matching master address.
zones = { 'zones': [
{ 'name': TEST_ZONE_NAME_STR,
'master_addr': TEST_MASTER_IPV6_ADDRESS,
......@@ -1919,19 +1919,23 @@ class TestXfrin(unittest.TestCase):
}
]}
self.xfr.config_handler(zones)
# the command should now fail
self.assertEqual(self.xfr.command_handler("notify",
self.args)['result'][0], 0)
# Note: The rest of the tests won't pass due to the change in #1298
# We should probably simply remove the test cases, but for now we
# just comment them out. (Note also that the comment about 'not
# from the config' is now wrong, because we used the matching address.)
#
# and see if we used the address from the command, and not from
# the config
# This is actually NOT the address given in the command, which
# would at this point not make sense, see the TODO in
# xfrin.py.in Xfrin.command_handler())
self.assertEqual(TEST_MASTER_IPV6_ADDRESS,
self.xfr.xfrin_started_master_addr)
self.assertEqual(int(TEST_MASTER_PORT),
self.xfr.xfrin_started_master_port)
# self.assertEqual(TEST_MASTER_IPV4_ADDRESS,
# self.xfr.xfrin_started_master_addr)
# self.assertEqual(int(TEST_MASTER_PORT),
# self.xfr.xfrin_started_master_port)
def test_command_handler_unknown(self):
self.assertEqual(self.xfr.command_handler("xxx", None)['result'][0], 1)
......
Supports Markdown
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