From patchwork Thu Jan 28 19:39:56 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rini X-Patchwork-Id: 1432989 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DRW5p4FMhz9sVF for ; Fri, 29 Jan 2021 06:40:14 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E394C82808; Thu, 28 Jan 2021 20:40:07 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Received: by phobos.denx.de (Postfix, from userid 109) id 548A782816; Thu, 28 Jan 2021 20:40:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 77E44827EA for ; Thu, 28 Jan 2021 20:40:02 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=konsulko.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=tom.rini@gmail.com Received: by mail-qt1-f174.google.com with SMTP id o18so4978773qtp.10 for ; Thu, 28 Jan 2021 11:40:02 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=Q9Lzqflm6IU/tC0jiQBG2KfHdRqgCb1jHd14TOoJlEg=; b=m9wIv48MjeRt60u2YGBHe2sEvnCEnQ/FTfpu1xVnYYkqERqjVwN+ZB02jwJltLCfeX aVBUyjlKLqksRmoNMyWnbxqv/i4Jr8fjmGXw3/VlhWoM5cZVWGmy6ECwBTEJH7QijWzn d+y3pUusFK77KH/OnyW1ZW6lzqtzMYJO0/wlgXrc8Pb9UAGBcOVHM3JdNeWTkF5bJBpL vEA/yF0CvTU5Ru3G2wzmZkt/bfNnHOyAmN9WxZ/iCuk7FoccYu3+6WHFKBV4zCKb+ZbM n6kOGsv+RIeLBsHbZMqAmdDfFq6FGGRCD6J0d3K5Qr+ZDz9IqfkhjVY3HfFdhlZDIbws eqXw== X-Gm-Message-State: AOAM532Xz2wDnrVnXRqCvf5pF6jCxWciHzzgtVbxJ7X+Tndb00yhIthM l57AYI6sCygbNW2h0pkFkftPex1kkw== X-Google-Smtp-Source: ABdhPJwPktZ9fVINfar7Xdt0d743nGIDVYVUgtsFpreWehvKiP6sE5tuJEmBckpznIHcstTq9lEm/Q== X-Received: by 2002:ac8:6743:: with SMTP id n3mr1086579qtp.327.1611862800737; Thu, 28 Jan 2021 11:40:00 -0800 (PST) Received: from bill-the-cat.lan (2603-6081-7b07-927a-f135-5804-e989-1fd5.res6.spectrum.com. [2603:6081:7b07:927a:f135:5804:e989:1fd5]) by smtp.gmail.com with ESMTPSA id u63sm4233269qkc.115.2021.01.28.11.39.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 28 Jan 2021 11:39:59 -0800 (PST) From: Tom Rini To: u-boot@lists.denx.de Subject: [PATCH] test: Update test_fs to not use deprecated pytest.yield_fixture() Date: Thu, 28 Jan 2021 14:39:56 -0500 Message-Id: <20210128193956.30928-1-trini@konsulko.com> X-Mailer: git-send-email 2.17.1 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.102.3 at phobos.denx.de X-Virus-Status: Clean 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 58e8cd46ee2c..ec70e8c4ef3f 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.