[U-Boot] [PATCH] test: py: Use global pytestmark for hush tests

[U-Boot] [PATCH] test: py: Use global pytestmark for hush tests

[Michal Simek]

All tests in test_hush_if_test depends on hush parser
to be present.
This patch simplify test dependencies by using global
pytestmark.

Reported-by: Stephen Warren <swarren@nvidia.com>
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
---

 test/py/tests/test_hush_if_test.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py
index b572538528e1..056a2880303e 100644
--- a/test/py/tests/test_hush_if_test.py
+++ b/test/py/tests/test_hush_if_test.py
@@ -8,6 +8,8 @@ import os
 import os.path
 import pytest
 
+pytestmark = pytest.mark.buildconfigspec('hush_parser')
+
 # The list of "if test" conditions to test.
 subtests = (
     # Base if functionality.
@@ -109,27 +111,23 @@ def exec_hush_if(u_boot_console, expr, result):
     response = u_boot_console.run_command(cmd)
     assert response.strip() == str(result).lower()
 
- at pytest.mark.buildconfigspec('hush_parser')
 def test_hush_if_test_setup(u_boot_console):
     """Set up environment variables used during the "if" tests."""
 
     u_boot_console.run_command('setenv ut_var_nonexistent')
     u_boot_console.run_command('setenv ut_var_exists 1')
 
- at pytest.mark.buildconfigspec('hush_parser')
 @pytest.mark.parametrize('expr,result', subtests)
 def test_hush_if_test(u_boot_console, expr, result):
     """Test a single "if test" condition."""
 
     exec_hush_if(u_boot_console, expr, result)
 
- at pytest.mark.buildconfigspec('hush_parser')
 def test_hush_if_test_teardown(u_boot_console):
     """Clean up environment variables used during the "if" tests."""
 
     u_boot_console.run_command('setenv ut_var_exists')
 
- at pytest.mark.buildconfigspec('hush_parser')
 # We might test this on real filesystems via UMS, DFU, 'save', etc.
 # Of those, only UMS currently allows file removal though.
 @pytest.mark.boardspec('sandbox')
-- 
1.9.1

[U-Boot] [PATCH] test: py: Use global pytestmark for hush tests

[Stephen Warren]

On 05/17/2017 03:17 AM, Michal Simek wrote:
> All tests in test_hush_if_test depends on hush parser
> to be present.
> This patch simplify test dependencies by using global
> pytestmark.

Nit: That seems to have been accidentally line-wrapped.

> diff --git a/test/py/tests/test_hush_if_test.py b/test/py/tests/test_hush_if_test.py

> +pytestmark = pytest.mark.buildconfigspec('hush_parser')

This is fine to unify the marking, but I was actually talking about 
adding a new dependency on cmd_echo, which I assume can be turned off 
even with hush_parser enabled?

[U-Boot] [PATCH] test: py: Use global pytestmark for hush tests

[Michal Simek]

On 17.5.2017 17:08, Stephen Warren wrote:
> On 05/17/2017 03:17 AM, Michal Simek wrote:
>> All tests in test_hush_if_test depends on hush parser
>> to be present.
>> This patch simplify test dependencies by using global
>> pytestmark.
> 
> Nit: That seems to have been accidentally line-wrapped.
> 
>> diff --git a/test/py/tests/test_hush_if_test.py
>> b/test/py/tests/test_hush_if_test.py
> 
>> +pytestmark = pytest.mark.buildconfigspec('hush_parser')
> 
> This is fine to unify the marking, but I was actually talking about
> adding a new dependency on cmd_echo, which I assume can be turned off
> even with hush_parser enabled?

Definitely dependencies should be for both.

Thanks,
Michal