Refactor Python Node ping function (#643)

* Refactor ping command to remove pexpect dependency on each cert test
This commit is contained in:
Nick Banks
2016-09-20 18:13:57 -07:00
committed by Jonathan Hui
parent 1ec2e76ecd
commit c063ec1477
69 changed files with 133 additions and 222 deletions
@@ -27,7 +27,6 @@
# POSSIBILITY OF SUCH DAMAGE.
#
import pexpect
import time
import unittest
@@ -108,17 +107,17 @@ class Cert_5_3_9_AddressQuery(unittest.TestCase):
addrs = self.nodes[ROUTER3].get_addrs()
for addr in addrs:
if addr[0:4] != 'fe80':
self.nodes[SED2].ping(addr)
self.assertTrue(self.nodes[SED2].ping(addr))
addrs = self.nodes[SED2].get_addrs()
for addr in addrs:
if addr[0:4] != 'fe80':
self.nodes[BR].ping(addr)
self.assertTrue(self.nodes[BR].ping(addr))
addrs = self.nodes[ROUTER3].get_addrs()
for addr in addrs:
if addr[0:4] != 'fe80':
self.nodes[SED2].ping(addr)
self.assertTrue(self.nodes[SED2].ping(addr))
self.nodes[ROUTER3].stop()
time.sleep(300)
@@ -126,11 +125,7 @@ class Cert_5_3_9_AddressQuery(unittest.TestCase):
addrs = self.nodes[ROUTER3].get_addrs()
for addr in addrs:
if addr[0:4] != 'fe80':
try:
self.nodes[SED2].ping(addr)
self.fail()
except pexpect.TIMEOUT:
pass
self.assertFalse(self.nodes[SED2].ping(addr))
self.nodes[SED2].stop()
time.sleep(10)
@@ -138,11 +133,7 @@ class Cert_5_3_9_AddressQuery(unittest.TestCase):
addrs = self.nodes[SED2].get_addrs()
for addr in addrs:
if addr[0:4] != 'fe80':
try:
self.nodes[BR].ping(addr)
self.fail()
except pexpect.TIMEOUT:
pass
self.assertFalse(self.nodes[BR].ping(addr))
if __name__ == '__main__':
unittest.main()