Return one string for each command that was executed. This seems cleaner.
Suggested-by: Teddy Reed <[email protected]>
Signed-off-by: Simon Glass <[email protected]>
---
test/py/tests/test_vboot.py | 2 +-
test/py/u_boot_console_base.py | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/test/py/tests/test_vboot.py b/test/py/tests/test_vboot.py
index d7ab439..021892b 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 b855b10..ee9b928 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):
--
2.8.0.rc3.226.g39d4020
_______________________________________________
U-Boot mailing list
[email protected]
http://lists.denx.de/mailman/listinfo/u-boot
