[tests] fix wrong whitelist filter in commissioning tests (#4933)

This commit fixes the problem that `whitelist` is not enabled in
commissioning test cases which results in false pass of `Cert_8_2_01`
and `Cert_8_2_02`.

Without this commit, `Cert_8_2_01` and `Cert_8_2_02` will fail if we
turn on `whitelist`, because we now use random extaddress for
discovery requests.
This commit is contained in:
kangping
2020-05-19 10:30:11 -07:00
committed by GitHub
parent 6adfa966e0
commit 154958aab9
2 changed files with 10 additions and 22 deletions
@@ -70,11 +70,6 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase):
self.nodes[JOINER].get_eui64(), 'PSKD02')
self.simulator.go(5)
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_joiner_id())
self.nodes[JOINER_ROUTER].add_whitelist(
self.nodes[COMMISSIONER].get_addr64())
self.nodes[JOINER_ROUTER].interface_up()
self.nodes[JOINER_ROUTER].joiner_start('PSKD01')
self.simulator.go(10)
@@ -83,15 +78,15 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase):
self.nodes[COMMISSIONER].get_masterkey(),
)
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER_ROUTER].thread_start()
self.simulator.go(5)
self.assertEqual(self.nodes[JOINER_ROUTER].get_state(), 'router')
self.nodes[JOINER_ROUTER].add_whitelist(
self.nodes[JOINER].get_joiner_id())
self.nodes[COMMISSIONER].enable_whitelist()
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_whitelist()
self.nodes[JOINER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].interface_up()
@@ -102,8 +97,6 @@ class Cert_8_2_01_JoinerRouter(thread_cert.TestCase):
self.nodes[COMMISSIONER].get_masterkey(),
)
self.nodes[JOINER_ROUTER].add_whitelist(self.nodes[JOINER].get_addr64())
self.nodes[JOINER].thread_start()
self.simulator.go(5)
self.assertEqual(self.nodes[JOINER].get_state(), 'router')
@@ -70,11 +70,6 @@ class Cert_8_2_02_JoinerRouter(thread_cert.TestCase):
self.nodes[JOINER].get_eui64(), 'PSKD02')
self.simulator.go(5)
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_joiner_id())
self.nodes[JOINER_ROUTER].add_whitelist(
self.nodes[COMMISSIONER].get_addr64())
self.nodes[JOINER_ROUTER].interface_up()
self.nodes[JOINER_ROUTER].joiner_start('PSKD01')
self.simulator.go(10)
@@ -83,15 +78,15 @@ class Cert_8_2_02_JoinerRouter(thread_cert.TestCase):
self.nodes[COMMISSIONER].get_masterkey(),
)
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER_ROUTER].thread_start()
self.simulator.go(5)
self.assertEqual(self.nodes[JOINER_ROUTER].get_state(), 'router')
self.nodes[JOINER_ROUTER].add_whitelist(
self.nodes[JOINER].get_joiner_id())
self.nodes[COMMISSIONER].enable_whitelist()
self.nodes[COMMISSIONER].add_whitelist(
self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].enable_whitelist()
self.nodes[JOINER].add_whitelist(self.nodes[JOINER_ROUTER].get_addr64())
self.nodes[JOINER].interface_up()