All of lore.kernel.org
 help / color / mirror / Atom feed
From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH] test: correct entry point to pytest
Date: Sat, 30 Jan 2021 14:21:57 -0500	[thread overview]
Message-ID: <20210130192157.GS7530@bill-the-cat> (raw)
In-Reply-To: <20210128114611.128865-1-xypron.glpk@gmx.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 <module>
>     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 <xypron.glpk@gmx.de>
> Tested-by: Andy Shevchenko <andy.shevchenko@gmail.com>
> Tested-by: Tom Rini <trini@konsulko.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20210130/1ca2ebe9/attachment.sig>

      parent reply	other threads:[~2021-01-30 19:21 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-01-28 11:46 [PATCH] test: correct entry point to pytest Heinrich Schuchardt
2021-01-28 12:58 ` Tom Rini
2021-01-28 13:28   ` Heinrich Schuchardt
2021-01-28 16:17     ` Tom Rini
2021-01-28 18:36       ` Heinrich Schuchardt
2021-01-28 23:56         ` Tom Rini
2021-01-29  9:59           ` Andy Shevchenko
2021-01-28 18:23 ` Andy Shevchenko
2021-01-28 19:36 ` Andy Shevchenko
2021-01-30 19:21 ` Tom Rini [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210130192157.GS7530@bill-the-cat \
    --to=trini@konsulko.com \
    --cc=u-boot@lists.denx.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.