diff --git a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py index e65bd225b..d7393ddf4 100755 --- a/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_01_NetworkDataRegisterBeforeAttachLeader.py @@ -94,15 +94,15 @@ class Cert_5_6_1_NetworkDataLeaderAsBr(unittest.TestCase): self.assertEqual(self.nodes[SED1].get_state(), 'child') addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word[0:4] for word in addrs)) - self.assertTrue(any('2002' in word[0:4] for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word[0:4] for word in addrs)) - self.assertFalse(any('2002' in word[0:4] for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py index f12ab1188..b1d38a48f 100755 --- a/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_02_NetworkDataRegisterBeforeAttachRouter.py @@ -94,15 +94,15 @@ class Cert_5_6_2_NetworkDataRouterAsBr(unittest.TestCase): self.assertEqual(self.nodes[SED1].get_state(), 'child') addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py index b5a0accfb..de92581b3 100755 --- a/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py +++ b/tests/scripts/thread-cert/Cert_5_6_03_NetworkDataRegisterAfterAttachLeader.py @@ -96,15 +96,15 @@ class Cert_5_6_3_NetworkDataRegisterAfterAttachLeader(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py index 109a4621c..85f1fe91d 100755 --- a/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_04_NetworkDataRegisterAfterAttachRouter.py @@ -96,15 +96,15 @@ class Cert_5_6_4_NetworkDataRegisterAfterAttachRouter(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py index 5babf7336..9e6d876ba 100755 --- a/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py +++ b/tests/scripts/thread-cert/Cert_5_6_05_NetworkDataRegisterAfterAttachRouter.py @@ -96,15 +96,15 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) @@ -115,17 +115,17 @@ class Cert_5_6_5_NetworkDataRegisterAfterAttachRouter(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py index 6407c878f..63173d559 100755 --- a/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py +++ b/tests/scripts/thread-cert/Cert_5_6_06_NetworkDataExpiration.py @@ -96,15 +96,15 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) @@ -115,17 +115,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) @@ -135,17 +135,17 @@ class Cert_5_6_6_NetworkDataExpiration(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) - self.assertFalse(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) - self.assertFalse(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py index b3dc2fff8..2062a9279 100755 --- a/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py +++ b/tests/scripts/thread-cert/Cert_5_6_07_NetworkDataRequestREED.py @@ -92,7 +92,7 @@ class Cert_5_6_7_NetworkDataRequestREED(unittest.TestCase): time.sleep(10) addrs = self.nodes[REED].get_addrs() - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2003': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py index f7e785af1..4bcd0bdc0 100755 --- a/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py +++ b/tests/scripts/thread-cert/Cert_5_6_08_ContextManagement.py @@ -83,7 +83,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase): time.sleep(2) addrs = self.nodes[LEADER].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) @@ -93,7 +93,7 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase): time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in word for word in addrs)) + self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) @@ -103,8 +103,8 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase): time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) @@ -115,9 +115,9 @@ class Cert_5_6_8_ContextManagement(unittest.TestCase): time.sleep(5) addrs = self.nodes[LEADER].get_addrs() - self.assertFalse(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertFalse(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:3] == '200': self.assertTrue(self.nodes[ED].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py index dc99bd1e2..03df3b1b1 100755 --- a/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py +++ b/tests/scripts/thread-cert/Cert_6_3_02_NetworkDataUpdate.py @@ -71,7 +71,7 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase): time.sleep(3) addrs = self.nodes[ED].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001': self.assertTrue(self.nodes[LEADER].ping(addr)) @@ -88,8 +88,8 @@ class Cert_5_6_2_NetworkDataUpdate(unittest.TestCase): time.sleep(10) addrs = self.nodes[ED].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py index 5140320f2..290f084b6 100755 --- a/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_01_BorderRouterAsLeader.py @@ -94,15 +94,15 @@ class Cert_7_1_1_BorderRouterAsLeader(unittest.TestCase): self.assertEqual(self.nodes[ED1].get_state(), 'child') addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py index 4cab83808..2f7da23c5 100755 --- a/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_02_BorderRouterAsRouter.py @@ -94,15 +94,15 @@ class Cert_7_1_2_BorderRouterAsRouter(unittest.TestCase): self.assertEqual(self.nodes[SED2].get_state(), 'child') addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py index ea3ccb3a3..74bcd17b8 100755 --- a/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py +++ b/tests/scripts/thread-cert/Cert_7_1_03_BorderRouterAsLeader.py @@ -95,15 +95,15 @@ class Cert_7_1_3_BorderRouterAsLeader(unittest.TestCase): time.sleep(3) addrs = self.nodes[SED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[ED1].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py index 9cdc786ea..d1213a0a7 100755 --- a/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_04_BorderRouterAsRouter.py @@ -95,15 +95,15 @@ class Cert_7_1_4_BorderRouterAsRouter(unittest.TestCase): time.sleep(3) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) diff --git a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py index 4b08e798a..89cf3924d 100755 --- a/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py +++ b/tests/scripts/thread-cert/Cert_7_1_05_BorderRouterAsRouter.py @@ -95,15 +95,15 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase): time.sleep(3) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002': self.assertTrue(self.nodes[LEADER].ping(addr)) @@ -113,17 +113,17 @@ class Cert_7_1_5_BorderRouterAsRouter(unittest.TestCase): time.sleep(3) addrs = self.nodes[ED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertTrue(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003': self.assertTrue(self.nodes[LEADER].ping(addr)) addrs = self.nodes[SED2].get_addrs() - self.assertTrue(any('2001' in word for word in addrs)) - self.assertFalse(any('2002' in word for word in addrs)) - self.assertTrue(any('2003' in word for word in addrs)) + self.assertTrue(any('2001' in addr[0:4] for addr in addrs)) + self.assertFalse(any('2002' in addr[0:4] for addr in addrs)) + self.assertTrue(any('2003' in addr[0:4] for addr in addrs)) for addr in addrs: if addr[0:4] == '2001' or addr[0:4] == '2002' or addr[0:4] == '2003': self.assertTrue(self.nodes[LEADER].ping(addr))