test/memory: fixing line parsing in memory autotest

Message ID 1510251272-32549-1-git-send-email-radoslaw.biernacki@linaro.org
State New
Headers show
Series
  • test/memory: fixing line parsing in memory autotest
Related show

Commit Message

Radoslaw Biernacki Nov. 9, 2017, 6:14 p.m.
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: 7ba49d39f14c ("mem: rename segment address from physical to IOVA")
Fixes: b4ce15aa2bc7 ("app/test: fix memory autotest")

Signed-off-by: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>

---
 test/test/autotest_test_funcs.py | 37 +++++++++++++++++++++++--------------
 1 file changed, 23 insertions(+), 14 deletions(-)

-- 
2.7.4

Comments

Thomas Monjalon Nov. 12, 2017, 2:48 a.m. | #1
09/11/2017 19:14, Radoslaw Biernacki:
> 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: 7ba49d39f14c ("mem: rename segment address from physical to IOVA")

> Fixes: b4ce15aa2bc7 ("app/test: fix memory autotest")

> 

> Signed-off-by: Radoslaw Biernacki <radoslaw.biernacki@linaro.org>


Applied, thanks

Patch

diff --git a/test/test/autotest_test_funcs.py b/test/test/autotest_test_funcs.py
index 8da8fcd..15fcb7c 100644
--- a/test/test/autotest_test_funcs.py
+++ b/test/test/autotest_test_funcs.py
@@ -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]*, " \
-             "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",
-                          pexpect.TIMEOUT], timeout=10)
-    if index == 1:
-        return -1, "Fail"
-    elif index == 2:
-        return -1, "Fail [Timeout]"
+    while True:
+        regexp = "IOVA:0x[0-9a-f]*, len:([0-9]*), virt:0x[0-9a-f]*, " \
+                 "socket_id:[0-9]*"
+        index = child.expect([regexp, "Test OK", "Test Failed",
+                              pexpect.TIMEOUT], timeout=10)
+        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"