[U-Boot] [PATCH] test/py: Fix pytest4 deprecation warnings

* [U-Boot] [PATCH] test/py: Fix pytest4 deprecation warnings
@ 2019-03-13  4:08 Marek Vasut
  2019-03-13 11:19 ` Tom Rini
  0 siblings, 1 reply; 17+ messages in thread
From: Marek Vasut @ 2019-03-13  4:08 UTC (permalink / raw)
  To: u-boot

Fix the following spit from pytest:

u-boot/test/py/conftest.py:438: RemovedInPytest4Warning: MarkInfo objects are deprecated as they contain merged marks which are hard to deal with correctly.
  Please use node.get_closest_marker(name) or node.iter_markers(name).
  Docs: https://docs.pytest.org/en/latest/mark.html#updating-code
    for board in mark.args:

In both cases, the later suggestion is applicable.

Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Cc: Igor Opaniuk <igor.opaniuk@linaro.org>
Cc: Tom Rini <trini@konsulko.com>
Cc: Simon Glass <sjg@chromium.org>
---
 test/py/conftest.py | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/test/py/conftest.py b/test/py/conftest.py
index e40cbf0ba1..745ca5ac4a 100644
--- a/test/py/conftest.py
+++ b/test/py/conftest.py
@@ -431,11 +431,9 @@ def setup_boardspec(item):
         Nothing.
     """
 
-    mark = item.get_marker('boardspec')
-    if not mark:
-        return
     required_boards = []
-    for board in mark.args:
+    for boards in item.iter_markers('boardspec'):
+        board = boards.args[0]
         if board.startswith('!'):
             if ubconfig.board_type == board[1:]:
                 pytest.skip('board "%s" not supported' % ubconfig.board_type)
@@ -459,10 +457,8 @@ def setup_buildconfigspec(item):
         Nothing.
     """
 
-    mark = item.get_marker('buildconfigspec')
-    if not mark:
-        return
-    for option in mark.args:
+    for options in item.iter_markers('buildconfigspec'):
+        option = options.args[0]
         if not ubconfig.buildconfig.get('config_' + option.lower(), None):
             pytest.skip('.config feature "%s" not enabled' % option.lower())
 
-- 
2.20.1

^ permalink raw reply related	[flat|nested] 17+ messages in thread