From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tom Rini Date: Thu, 28 Jan 2021 07:58:28 -0500 Subject: [PATCH] test: correct entry point to pytest In-Reply-To: <20210128114611.128865-1-xypron.glpk@gmx.de> References: <20210128114611.128865-1-xypron.glpk@gmx.de> Message-ID: <20210128125828.GT7530@bill-the-cat> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Thu, Jan 28, 2021 at 12:46:11PM +0100, Heinrich Schuchardt wrote: > With Pytest 6.0.2 'make tests' fails: > > sandbox: Traceback (most recent call last): > File "./test/py/test.py", line 20, in > sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) > TypeError: console_main() takes 0 positional arguments but 1 was given > > The definition of console_scripts has changed as follows: > > Pytest 4.6.1: > > [options.entry_points] > console_scripts = > ????????pytest=pytest:main > ????????py.test=pytest:main > ???????? > Pytest 6.0.2: > ???????? > [options.entry_points] > console_scripts = > pytest=pytest:console_main > py.test=pytest:console_main > > The new function console_main() has a comment: > "This function is not meant for programmable use; use `main()`" > > Hence let's call pytest.main() directly. > Move args processing into the __main__ paragraph. > > Signed-off-by: Heinrich Schuchardt > --- > test/py/test.py | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) So the last round of "newer pytest means we need to ..." was part of why we have test/py/requirements.txt right now. That was over a year ago. So, for after v2021.04 it would be good to update pytest to current and deal with any updating that needs updating in our tests and related code. Thanks! -- Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 659 bytes Desc: not available URL: