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>
This commit is contained in:
parent
27c087d58a
commit
f6d34651d8
|
@ -71,7 +71,7 @@ def test_vboot(u_boot_console):
|
||||||
['sb load hostfs - 100 %stest.fit' % tmpdir,
|
['sb load hostfs - 100 %stest.fit' % tmpdir,
|
||||||
'fdt addr 100',
|
'fdt addr 100',
|
||||||
'bootm 100'])
|
'bootm 100'])
|
||||||
assert(expect_string in output)
|
assert(expect_string in ''.join(output))
|
||||||
|
|
||||||
def make_fit(its):
|
def make_fit(its):
|
||||||
"""Make a new FIT from the .its source file.
|
"""Make a new FIT from the .its source file.
|
||||||
|
|
|
@ -225,11 +225,12 @@ class ConsoleBase(object):
|
||||||
Args:
|
Args:
|
||||||
cmd: List of commands (each a string).
|
cmd: List of commands (each a string).
|
||||||
Returns:
|
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:
|
for cmd in cmds:
|
||||||
output += self.run_command(cmd)
|
output.append(self.run_command(cmd))
|
||||||
return output
|
return output
|
||||||
|
|
||||||
def ctrlc(self):
|
def ctrlc(self):
|
||||||
|
|
Loading…
Reference in New Issue