[style] update python style to conform to PEP 8 (#3951)

With the exception of line length set to 119 vs. 79.

Add tests/ and tools/ to py-pretty-check.
This commit is contained in:
Jonathan Hui
2019-07-11 11:45:55 -04:00
committed by GitHub
parent a938ee2845
commit f924adcb60
341 changed files with 8702 additions and 4460 deletions
+37 -18
View File
@@ -28,7 +28,6 @@
#
import re
import time
import unittest
import node
@@ -48,12 +47,13 @@ SRV_1_ENT_NUMBER = '234'
SRV_1_SERVICE_DATA = 'baz'
SRV_1_SERVER_DATA = 'qux'
class Test_Service(unittest.TestCase):
def setUp(self):
self.simulator = config.create_default_simulator()
self.nodes = {}
for i in range(1,4):
for i in range(1, 4):
self.nodes[i] = node.Node(i, simulator=self.simulator)
self.nodes[LEADER].set_panid(0xface)
@@ -83,27 +83,31 @@ class Test_Service(unittest.TestCase):
self.nodes[ROUTER2].set_router_selection_jitter(1)
def tearDown(self):
for node in list(self.nodes.values()):
node.stop()
node.destroy()
for n in list(self.nodes.values()):
n.stop()
n.destroy()
self.simulator.stop()
def hasAloc(self, node_id, service_id):
for addr in self.nodes[node_id].get_ip6_address(config.ADDRESS_TYPE.ALOC):
for addr in self.nodes[node_id].get_ip6_address(
config.ADDRESS_TYPE.ALOC
):
m = re.match('.*:fc(..)$', addr, re.I)
if m is not None:
if m.group(1) == str(service_id + 10): # for service_id=3 look for '...:fc13'
if m.group(1) == str(
service_id + 10
): # for service_id=3 look for '...:fc13'
return True
return False
def pingFromAll(self, addr):
for node in list(self.nodes.values()):
self.assertTrue(node.ping(addr))
for n in list(self.nodes.values()):
self.assertTrue(n.ping(addr))
def failToPingFromAll(self, addr):
for node in list(self.nodes.values()):
self.assertFalse(node.ping(addr, timeout=3))
for n in list(self.nodes.values()):
self.assertFalse(n.ping(addr, timeout=3))
def test(self):
self.nodes[LEADER].start()
@@ -123,7 +127,9 @@ class Test_Service(unittest.TestCase):
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
self.nodes[ROUTER1].add_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA)
self.nodes[ROUTER1].add_service(
SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA
)
self.nodes[ROUTER1].register_netdata()
self.simulator.go(2)
@@ -134,10 +140,14 @@ class Test_Service(unittest.TestCase):
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), False)
aloc0 = self.nodes[ROUTER1].get_ip6_address(config.ADDRESS_TYPE.ALOC)[0]
aloc0 = self.nodes[ROUTER1].get_ip6_address(config.ADDRESS_TYPE.ALOC)[
0
]
self.pingFromAll(aloc0)
self.nodes[LEADER].add_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA)
self.nodes[LEADER].add_service(
SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA, SRV_0_SERVER_DATA
)
self.nodes[LEADER].register_netdata()
self.simulator.go(2)
@@ -150,7 +160,9 @@ class Test_Service(unittest.TestCase):
self.pingFromAll(aloc0)
self.nodes[ROUTER2].add_service(SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA, SRV_1_SERVER_DATA)
self.nodes[ROUTER2].add_service(
SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA, SRV_1_SERVER_DATA
)
self.nodes[ROUTER2].register_netdata()
self.simulator.go(2)
@@ -161,11 +173,15 @@ class Test_Service(unittest.TestCase):
self.assertEqual(self.hasAloc(ROUTER2, SRV_0_ID), False)
self.assertEqual(self.hasAloc(ROUTER2, SRV_1_ID), True)
aloc1 = self.nodes[ROUTER2].get_ip6_address(config.ADDRESS_TYPE.ALOC)[0]
aloc1 = self.nodes[ROUTER2].get_ip6_address(config.ADDRESS_TYPE.ALOC)[
0
]
self.pingFromAll(aloc0)
self.pingFromAll(aloc1)
self.nodes[ROUTER1].remove_service(SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA)
self.nodes[ROUTER1].remove_service(
SRV_0_ENT_NUMBER, SRV_0_SERVICE_DATA
)
self.nodes[ROUTER1].register_netdata()
self.simulator.go(2)
@@ -193,7 +209,9 @@ class Test_Service(unittest.TestCase):
self.failToPingFromAll(aloc0)
self.pingFromAll(aloc1)
self.nodes[ROUTER2].remove_service(SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA)
self.nodes[ROUTER2].remove_service(
SRV_1_ENT_NUMBER, SRV_1_SERVICE_DATA
)
self.nodes[ROUTER2].register_netdata()
self.simulator.go(2)
@@ -207,5 +225,6 @@ class Test_Service(unittest.TestCase):
self.failToPingFromAll(aloc0)
self.failToPingFromAll(aloc1)
if __name__ == '__main__':
unittest.main()