From: Simon Glass <sjg@chromium.org>
Date: Sun, 31 Jul 2016 23:35:09 +0000 (-0600)
Subject: test: Adjust run_command_list() to return a list of strings
X-Git-Tag: v2016.09-rc2~101
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f6d34651d8a21514abbfa32f44a0ec2014ef002b;p=u-boot

test: Adjust run_command_list() to return a list of strings

Return one string for each command that was executed. This seems cleaner.

Suggested-by: Teddy Reed <teddy.reed@gmail.com>
Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
---

diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py
index d7ab439b2b..021892bb3d 100644
--- a/test/py/tests/test_vboot.py
+++ b/test/py/tests/test_vboot.py
@@ -71,7 +71,7 @@ def test_vboot(u_boot_console):
                 ['sb load hostfs - 100 %stest.fit' % tmpdir,
                 'fdt addr 100',
                 'bootm 100'])
-        assert(expect_string in output)
+        assert(expect_string in ''.join(output))
 
     def make_fit(its):
         """Make a new FIT from the .its source file.
diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py
index b855b10ecc..ee9b928756 100644
--- a/test/py/u_boot_console_base.py
+++ b/test/py/u_boot_console_base.py
@@ -225,11 +225,12 @@ class ConsoleBase(object):
         Args:
             cmd: List of commands (each a string).
         Returns:
-            Combined output of all commands, as a string.
+            A list of output strings from each command, one element for each
+            command.
         """
-        output = ''
+        output = []
         for cmd in cmds:
-            output += self.run_command(cmd)
+            output.append(self.run_command(cmd))
         return output
 
     def ctrlc(self):