From 0eb14bf5d95425584280184e3580ffbb8e0047b4 Mon Sep 17 00:00:00 2001 From: Simon Lin Date: Mon, 1 Mar 2021 23:28:54 +0800 Subject: [PATCH] [thread-cert] remove border_routing directory (#6210) --- .../test_dnssd_server.py | 25 +++++++++++-------- 1 file changed, 14 insertions(+), 11 deletions(-) rename tests/scripts/thread-cert/{border_routing => border_router}/test_dnssd_server.py (92%) diff --git a/tests/scripts/thread-cert/border_routing/test_dnssd_server.py b/tests/scripts/thread-cert/border_router/test_dnssd_server.py similarity index 92% rename from tests/scripts/thread-cert/border_routing/test_dnssd_server.py rename to tests/scripts/thread-cert/border_router/test_dnssd_server.py index a1f886dfc..80282f03e 100644 --- a/tests/scripts/thread-cert/border_routing/test_dnssd_server.py +++ b/tests/scripts/thread-cert/border_router/test_dnssd_server.py @@ -213,14 +213,12 @@ class TestDnssdServerOnBr(thread_cert.TestCase): dig_result = self.nodes[DIGGER].dns_dig(server_addr, host1_full_name, qtype) self._assert_dig_result_matches(dig_result, { 'status': 'NOTIMP', - 'QUESTION': [(host1_full_name, 'IN', qtype)], }) for service_name in WRONG_SERVICE_NAMES: dig_result = self.nodes[DIGGER].dns_dig(server_addr, service_name, 'PTR') self._assert_dig_result_matches(dig_result, { 'status': 'NXDOMAIN', - 'QUESTION': [(service_name, 'IN', 'PTR')], }) def _config_srp_client_services(self, client, instancename, hostname, port, priority, weight, addrs): @@ -261,18 +259,23 @@ class TestDnssdServerOnBr(thread_cert.TestCase): self.assertEqual(dig_result['opcode'], expected_result.get('opcode', 'QUERY'), dig_result) self.assertEqual(dig_result['status'], expected_result.get('status', 'NOERROR'), dig_result) - self.assertEqual(len(dig_result['QUESTION']), len(expected_result.get('QUESTION', [])), dig_result) - self.assertEqual(len(dig_result['ANSWER']), len(expected_result.get('ANSWER', [])), dig_result) - self.assertEqual(len(dig_result['ADDITIONAL']), len(expected_result.get('ADDITIONAL', [])), dig_result) + if 'QUESTION' in expected_result: + self.assertEqual(len(dig_result['QUESTION']), len(expected_result['QUESTION']), dig_result) - for question in expected_result.get('QUESTION', []): - self._assert_have_question(dig_result, question) + for question in expected_result['QUESTION']: + self._assert_have_question(dig_result, question) - for record in expected_result.get('ANSWER', []): - self._assert_have_answer(dig_result, record, additional=False) + if 'ANSWER' in expected_result: + self.assertEqual(len(dig_result['ANSWER']), len(expected_result['ANSWER']), dig_result) - for record in expected_result.get('ADDITIONAL', []): - self._assert_have_answer(dig_result, record, additional=True) + for record in expected_result['ANSWER']: + self._assert_have_answer(dig_result, record, additional=False) + + if 'ADDITIONAL' in expected_result: + self.assertEqual(len(dig_result['ADDITIONAL']), len(expected_result['ADDITIONAL']), dig_result) + + for record in expected_result['ADDITIONAL']: + self._assert_have_answer(dig_result, record, additional=True) logging.info("dig result matches:\r%s", json.dumps(dig_result, indent=True))