From 154958aab9d643b44f2a491f06d51bb1dec4b7d9 Mon Sep 17 00:00:00 2001 From: kangping Date: Wed, 20 May 2020 01:30:11 +0800 Subject: [PATCH] [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. --- .../thread-cert/Cert_8_2_01_JoinerRouter.py | 17 +++++------------ .../thread-cert/Cert_8_2_02_JoinerRouter.py | 15 +++++---------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py index 491545060..af87cfe91 100755 --- a/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_01_JoinerRouter.py @@ -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') diff --git a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py index ab0a6e917..710f42b1e 100755 --- a/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py +++ b/tests/scripts/thread-cert/Cert_8_2_02_JoinerRouter.py @@ -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()