d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

test/memory: fix autotest parsing

Browse Source 
This patch fixes three problems in memory autotest:
 - the regex for IOVA
 - missing validation of second and following output lines
 - propagation of error to consecutive tests
 - conversion base for mem size (hex indtead of dec)
First fix is for changes introduced with IOVA, the regex was not
updated which lead to unit test failure.  Patch now also uses loop for
line outputs processing to verify more than just one line. By this we
also satisfy the pexpect() and scan the "Test OK"/"Test Failed" so in
case of error all output lines are consumed and does not break the
consecutive test (error does not propagate).

Fixes: 7ba49d39f1 ("mem: rename segment address from physical to IOVA")
Fixes: b4ce15aa2b ("app/test: fix memory autotest")

Signed-off-by: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>
This commit is contained in:
Radoslaw Biernacki 2017-11-09 19:14:32 +01:00 committed by Thomas Monjalon
parent 71330483a1
commit f046826e76
1 changed files with 23 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
test/test/autotest_test_funcs.py
View File

@ -62,21 +62,30 @@ def dump_autotest(child, test_name):
def memory_autotest(child, test_name):
lines = 0
error = ''
child.sendline(test_name)
regexp = "phys:0x[0-9a-f]*, len:([0-9]*), virt:0x[0-9a-f]*, " \
while True:
regexp = "IOVA:0x[0-9a-f]*, len:([0-9]*), virt:0x[0-9a-f]*, " \
"socket_id:[0-9]*"
index = child.expect([regexp, pexpect.TIMEOUT], timeout=180)
if index != 0:
return -1, "Fail [Timeout]"
size = int(child.match.groups()[0], 16)
if size <= 0:
return -1, "Fail [Bad size]"
index = child.expect(["Test OK", "Test Failed",
index = child.expect([regexp, "Test OK", "Test Failed",
pexpect.TIMEOUT], timeout=10)
if index == 1:
return -1, "Fail"
elif index == 2:
if index == 3:
return -1, "Fail [Timeout]"
elif index == 1:
break
elif index == 2:
return -1, "Fail"
else:
lines = lines + 1
size = int(child.match.groups()[0], 10)
if size <= 0:
error = 'Bad size'
if lines <= 0:
return -1, "Fail [No entries]"
if error != '':
return -1, "Fail [{}]".format(error)
return 0, "Success"