From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B282DEB64DA for ; Sun, 16 Jul 2023 13:37:43 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 523958622C; Sun, 16 Jul 2023 15:37:41 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.b="p7J3meb7"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 05ACA86233; Sun, 16 Jul 2023 15:37:40 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6D10A861CC for ; Sun, 16 Jul 2023 15:37:37 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=canonical.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=heinrich.schuchardt@canonical.com Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 5EB8C3F18D for ; Sun, 16 Jul 2023 13:37:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1689514654; bh=DXHecAbbdhixtXGbSMlfFEcXOxl7CYpIzuc7aJ/4w40=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=p7J3meb7u2YB8Jytir4HYLe4GSzPmuOkZJ3HO2XNFCSugtYtSjjC75SOYiR9WFAK5 lQEDCaxjUd5f59OTbvosfNJDINntYpwhEJJjvW1yBP84tLPY74QYeObIopD63q/H+f JZhu9UlCDQhWbCyS+J6Qa2yPqe7knhfAJOi+PCnr9HK55sH6PxQooxZ+HRPiBGmhl3 T4PeXCVjd7oI+wJioVvhqCePICCJcFgzl/0B0knIRoBTmA6TXQAqYAn/kjQBEVf9Rt 4ilmkE+6m8BxGQwKjWQmO3R/ShshKLSYZo1vpxhCFU6/AbJqg5nAUK+4pEHpL06DFg RhXOhQ793AGag== Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-3fbefe1b402so19290785e9.1 for ; Sun, 16 Jul 2023 06:37:34 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689514654; x=1692106654; h=content-transfer-encoding:in-reply-to:from:content-language :references:cc:to:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=DXHecAbbdhixtXGbSMlfFEcXOxl7CYpIzuc7aJ/4w40=; b=eSKnGY+l92mDG/wWH4gASVznLOlZ8XoPrnNFqGA4ZokJFxse8WQFvVA3YdjpqPwrPk X7zXSVhDy6dEAHOQR05bxTqtEM3OYIuH+zANXr3tA10coZ3Ue73Z2hf++JevNYIba0ZO j36HtflJ/2dNyNGq1feexS+evWzViODXP/Hk/8G2uQ9kr6+twQwFGFCwhCe9rfckXbYW mDw5h7tjqOBRn8X4WTr7/qWv3Qt58K0+Q9Hna3BwH0NUsmLc/l/237RTCDd18nG/f0Ig 78VUTECfLlBzRu2z29as5ffHqhQDatFdfRRxqqOcjVmB+NcmfNiBIzxMoisMnSBsxdQS UI3w== X-Gm-Message-State: ABy/qLY1loLGxMmVTk9eAexGkY/I20FgEi5TlGVxzvJUhOsw9VisHYHO bcZS5nPoPMP525wVho4pALHHfoUPk5Vmt6w5FsurMAO85LioVuvHqiiobl7l6076bEiX07cFqQH r4oy48A/PtHuDqWmKSNJ8vUD4g9wZZrs= X-Received: by 2002:a1c:7212:0:b0:3fc:1bd:95a6 with SMTP id n18-20020a1c7212000000b003fc01bd95a6mr7281244wmc.31.1689514653797; Sun, 16 Jul 2023 06:37:33 -0700 (PDT) X-Google-Smtp-Source: APBJJlGu7BGVebsr0IK/hD+qgE7x++PcBlnH1n7ZKZebU3IRaxmZMxGv6KSd8Kd52ZkYfJTCB3laTQ== X-Received: by 2002:a1c:7212:0:b0:3fc:1bd:95a6 with SMTP id n18-20020a1c7212000000b003fc01bd95a6mr7281237wmc.31.1689514653447; Sun, 16 Jul 2023 06:37:33 -0700 (PDT) Received: from [192.168.123.94] (ip-084-119-033-219.um24.pools.vodafone-ip.de. [84.119.33.219]) by smtp.gmail.com with ESMTPSA id z5-20020a7bc7c5000000b003fbd04ecdc6sm5650733wmk.5.2023.07.16.06.37.32 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 16 Jul 2023 06:37:32 -0700 (PDT) Message-ID: <58a4201b-0f97-c94a-6aaf-e3dffbfc4852@canonical.com> Date: Sun, 16 Jul 2023 15:37:56 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: [PATCH 1/1] test: avoid function name 'setup' To: Simon Glass Cc: Ilias Apalodimas , Masahisa Kojima , u-boot@lists.denx.de References: <20230715090522.205205-1-heinrich.schuchardt@canonical.com> Content-Language: en-US From: Heinrich Schuchardt In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.103.8 at phobos.denx.de X-Virus-Status: Clean On 7/16/23 01:40, Simon Glass wrote: > Hi Heinrich, > > On Sat, 15 Jul 2023 at 03:05, Heinrich Schuchardt > wrote: >> >> pytest 7.3.2 treats the function name 'setup' as a fixture [1]. >> >> This leads to errors like: >> >> TypeError: setup() missing 2 required positional arguments: >> 'disk_img' and 'osindications' >> >> Rename setup() to capsule_setup(). >> >> [1] How to run tests written for nose >> https://docs.pytest.org/en/7.3.x/how-to/nose.html >> >> Fixes: 482ef90aeb4c ("test: efi_capsule: refactor efi_capsule test") >> Signed-off-by: Heinrich Schuchardt >> --- >> test/py/tests/test_efi_capsule/capsule_common.py | 2 +- >> .../test_efi_capsule/test_capsule_firmware_fit.py | 10 +++++----- >> .../test_efi_capsule/test_capsule_firmware_raw.py | 12 ++++++------ >> .../test_capsule_firmware_signed_fit.py | 12 ++++++------ >> .../test_capsule_firmware_signed_raw.py | 12 ++++++------ >> 5 files changed, 24 insertions(+), 24 deletions(-) > > Reviewed-by: Simon Glass > > Would it make sense to reduce the code duplication a little? Thank you for reviewing. Fixed 482ef90aeb4c ("test: efi_capsule: refactor efi_capsule test") started the de-duplication effort. Best regards Heinrich