From a59e59c9be844553384b67c36a8040f65ec10011 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 28 Jan 2021 14:39:56 -0500 Subject: [PATCH] test: Update test_fs to not use deprecated pytest.yield_fixture() As noted in comments, yield_fixture has been deprecated for longer than our minimum required version of pytest. Newer versions of pytest cause this to be a louder warning, and as the migration is trivial, perform it now. Signed-off-by: Tom Rini --- test/py/tests/test_fs/conftest.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 58e8cd4..ec70e8c 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -243,8 +243,7 @@ def umount_fs(mount_point): # Fixture for basic fs test # derived from test/fs/fs-test.sh # -# NOTE: yield_fixture was deprecated since pytest-3.0 -@pytest.yield_fixture() +@pytest.fixture() def fs_obj_basic(request, u_boot_config): """Set up a file system to be used in basic fs test. @@ -352,8 +351,7 @@ def fs_obj_basic(request, u_boot_config): # # Fixture for extended fs test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -@pytest.yield_fixture() +@pytest.fixture() def fs_obj_ext(request, u_boot_config): """Set up a file system to be used in extended fs test. @@ -439,8 +437,7 @@ def fs_obj_ext(request, u_boot_config): # # Fixture for mkdir test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -@pytest.yield_fixture() +@pytest.fixture() def fs_obj_mkdir(request, u_boot_config): """Set up a file system to be used in mkdir test. @@ -472,8 +469,7 @@ def fs_obj_mkdir(request, u_boot_config): # # Fixture for unlink test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -@pytest.yield_fixture() +@pytest.fixture() def fs_obj_unlink(request, u_boot_config): """Set up a file system to be used in unlink test. @@ -538,8 +534,7 @@ def fs_obj_unlink(request, u_boot_config): # # Fixture for symlink fs test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -@pytest.yield_fixture() +@pytest.fixture() def fs_obj_symlink(request, u_boot_config): """Set up a file system to be used in symlink fs test. -- 2.7.4