[U-Boot] [PATCH 05/10] test/py: Split mark to multiple lines

Tom Rini
2019-10-18T20:53:33Z

We inconsistently note multiple dependencies today in our tests,
sometimes with a single line that declares multiple and sometimes
multiple single lines. Current pytest seems to fail on the single line
format so change to multiple declarations.

Signed-off-by: Tom Rini <trini@konsulko.com>
---
test/py/tests/test_android/test_avb.py | 9 ++++++---
test/py/tests/test_mmc_wr.py | 4 +++-
2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/test/py/tests/test_android/test_avb.py b/test/py/tests/test_android/test_avb.py
index 813242343555..20ccaf6712f2 100644
--- a/test/py/tests/test_android/test_avb.py
+++ b/test/py/tests/test_android/test_avb.py
@@ -23,7 +23,8 @@ mmc_dev = 1
temp_addr = 0x90000000
temp_addr2 = 0x90002000

- at pytest.mark.buildconfigspec('cmd_avb', 'cmd_mmc')
+ at pytest.mark.buildconfigspec('cmd_avb')
+ at pytest.mark.buildconfigspec('cmd_mmc')
def test_avb_verify(u_boot_console):
"""Run AVB 2.0 boot verification chain with avb subset of commands
"""
@@ -36,7 +37,8 @@ def test_avb_verify(u_boot_console):
assert response.find(success_str)

- at pytest.mark.buildconfigspec('cmd_avb', 'cmd_mmc')
+ at pytest.mark.buildconfigspec('cmd_avb')
+ at pytest.mark.buildconfigspec('cmd_mmc')
def test_avb_mmc_uuid(u_boot_console):
"""Check if 'avb get_uuid' works, compare results with
'part list mmc 1' output
@@ -93,7 +95,8 @@ def test_avb_is_unlocked(u_boot_console):
assert response == 'Unlocked = 1'

- at pytest.mark.buildconfigspec('cmd_avb', 'cmd_mmc')
+ at pytest.mark.buildconfigspec('cmd_avb')
+ at pytest.mark.buildconfigspec('cmd_mmc')
def test_avb_mmc_read(u_boot_console):
"""Test mmc read operation
"""
diff --git a/test/py/tests/test_mmc_wr.py b/test/py/tests/test_mmc_wr.py
index 2ce79f58e3b1..05e5c1ee85da 100644
--- a/test/py/tests/test_mmc_wr.py
+++ b/test/py/tests/test_mmc_wr.py
@@ -35,7 +35,9 @@ env__mmc_wr_configs = (

"""

- at pytest.mark.buildconfigspec('cmd_mmc','cmd_memory', 'cmd_random')
+ at pytest.mark.buildconfigspec('cmd_mmc')
+ at pytest.mark.buildconfigspec('cmd_memory')
+ at pytest.mark.buildconfigspec('cmd_random')
def test_mmc_wr(u_boot_console, env__mmc_wr_config):
"""Test the "mmc write" command.

--
2.17.1