From 3c941e048c824b94ae09fd9e1f91116f55ce0f1f Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 24 Oct 2019 11:59:19 -0400 Subject: test/py: Fix pytest4 deprecation warnings 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. Reviewed-by: Stephen Warren Reviewed-by: Simon Glass Signed-off-by: Marek Vasut Cc: Igor Opaniuk [trini: Update for current file with a few more cases, un-pin pytest in CI] Tested-by: Simon Glass [on sandbox] Tested-by: Stephen Warren Signed-off-by: Tom Rini --- .gitlab-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.gitlab-ci.yml') diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ab29499..5a34321 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -20,7 +20,7 @@ stages: - ln -s travis-ci /tmp/uboot-test-hooks/py/`hostname` - virtualenv /tmp/venv - . /tmp/venv/bin/activate - - pip install pytest==2.8.7 + - pip install pytest - pip install python-subunit - pip install coverage - grub-mkimage --prefix="" -o ~/grub_x86.efi -O i386-efi normal echo lsefimmap lsefi lsefisystab efinet tftp minicmd -- cgit v1.1