ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tests: explicitly wait for the PG to finish before looking for capture file

Browse Source 
Rather than only using time-based method of periodically checking
whether the pcap file appeared, first check that the packet generator
has stopped. To make this change fail-safe, have a 5-minute timeout
on this activity, just in case the things go terribly wrong.

Type: test
Signed-off-by: Andrew Yourtchenko <ayourtch@gmail.com>
Change-Id: Id16b2802b2de8a4cafb5d9f0a8c9ba62ec89dc32
This commit is contained in:
Andrew Yourtchenko
2019-10-11 12:34:12 +00:00
committed by Ole Trøan
parent 7e2cea3d26
commit 3d36f19a0f
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
test/vpp_pg_interface.py
View File

@ -295,6 +295,20 @@ class VppPGInterface(VppInterface):
raise AssertionError("Capture file present for interface %s" %
self.name)
def wait_for_pg_stop(self):
# wait till packet-generator is stopped
# "show packet-generator" while it is still running gives this:
# Name Enabled Count Parameters
# pcap0-sw_if_inde Yes 64 limit 64, ...
#
# also have a 5-minute timeout just in case things go terribly wrong...
deadline = time.time() + 300
while self.test.vapi.cli('show packet-generator').find("Yes") != -1:
self._test.sleep(0.01) # yield
if time.time() > deadline:
self.test.logger.debug("Timeout waiting for pg to stop")
break
def wait_for_capture_file(self, timeout=1):
"""
Wait until pcap capture file appears
@ -303,6 +317,7 @@ class VppPGInterface(VppInterface):
:returns: True/False if the file is present or appears within timeout
"""
self.wait_for_pg_stop()
deadline = time.time() + timeout
if not os.path.isfile(self.out_path):
self.test.logger.debug("Waiting for capture file %s to appear, "