test: correct entry point to pytest
PATCH 1/1 test: correct entry point to pytest
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.
--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
test/py/test.py +5 -5
@@ -10,11 +10,11 @@ import os import os.path import sys +import pytest from pkg_resources import load_entry_point -# argv; py.test test_directory_name user-supplied-arguments -args = [os.path.dirname(__file__) + '/tests'] -args.extend(sys.argv) - if __name__ == '__main__': - sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) + # argv; py.test test_directory_name user-supplied-arguments + args = [os.path.dirname(__file__) + '/tests'] + args.extend(sys.argv) + sys.exit(pytest.main(args))
--
2.29.2
PATCH 1/1 test: correct entry point to pytest
Quoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas 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_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"
Quoted 7 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>--- 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!
Signature · 8 lines
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/20210128/4795b141/attachment.sig>
PATCH 1/1 test: correct entry point to pytest
Quoted 36 lines · Tom Rini
Quoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas 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_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Quoted 7 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
Quoted 6 lines
So the last round of "newer pytest means we need to ..." was part of why we have
test/py/requirements.txtright 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!
This patch is not about making new requirements. It is about increasing the compatibility of our Python script with a larger range of Pytest revisions.
So I do not see the show-stopper for the current release.
Best regards
Heinrich
PATCH 1/1 test: correct entry point to pytest
Quoted 44 lines · Heinrich Schuchardt
Quoted 36 lines · Tom Rini
Quoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas 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_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Quoted 7 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)Quoted 6 lines
So the last round of "newer pytest means we need to ..." was part of why we have
test/py/requirements.txtright 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!
Quoted 5 lines
This patch is not about making new requirements. It is about increasing the compatibility of our Python script with a larger range of Pytest revisions.
So I do not see the show-stopper for the current release.
I bring up the last time because we support using "pip install -r test/py/requirements.txt" as how to create the supported test environment. This is based on my understanding of the time of the best practices of dealing with python modules.
Signature · 8 lines
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/20210128/66359715/attachment.sig>
PATCH 1/1 test: correct entry point to pytest
Quoted 49 lines · Tom Rini
Quoted 48 lines · Heinrich Schuchardt
Quoted 36 lines · Tom Rini
Quoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas changed as follows:Pytest 4.6.1:
[options.entry_points]
console_scripts=
????????pytest=pytest:main
????????py.test=pytest:mainPytest 6.0.2:
[options.entry_points]
console_scripts=
pytest=pytest:console_main
py.test=pytest:console_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Quoted 7 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)Quoted 6 lines
So the last round of "newer pytest means we need to ..." was part of why we have
test/py/requirements.txtright 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!This patch is not about making new requirements. It is about increasing the compatibility of our Python script with a larger range of Pytest revisions.
Quoted 6 lines
Quoted 1 line
So I do not see the show-stopper for the current release.
I bring up the last time because we support using "pip install -r
test/py/requirements.txt" as how to create the supported test environment. This is based on my understanding of the time of the best practices of dealing with python modules.
As you have read in the replies to that discussion it is not only me who due to security considerations will not run pip on his private computer but wants to use the packages from the distro.
This patch does not break anything. Hence I would appreciate if you could consider it for inclusion.
This does not stop you or Gitlab to use pip with your favorite Pytest version.
Best regards
Heinrich
PATCH 1/1 test: correct entry point to pytest
Quoted 61 lines · Heinrich Schuchardt
Quoted 49 lines · Tom Rini
Quoted 48 lines · Heinrich Schuchardt
Quoted 36 lines · Tom Rini
Quoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas changed as follows:Pytest 4.6.1:
[options.entry_points]
console_scripts=
????????pytest=pytest:main
????????py.test=pytest:mainPytest 6.0.2:
[options.entry_points]
console_scripts=
pytest=pytest:console_main
py.test=pytest:console_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Quoted 7 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)Quoted 6 lines
So the last round of "newer pytest means we need to ..." was part of why we have
test/py/requirements.txtright 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!This patch is not about making new requirements. It is about increasing the compatibility of our Python script with a larger range of Pytest revisions.
Quoted 6 lines
Quoted 1 line
So I do not see the show-stopper for the current release.
I bring up the last time because we support using "pip install -r
test/py/requirements.txt" as how to create the supported test environment. This is based on my understanding of the time of the best practices of dealing with python modules.As you have read in the replies to that discussion it is not only me who due to security considerations will not run pip on his private computer but wants to use the packages from the distro.
Quoted 5 lines
This patch does not break anything. Hence I would appreciate if you could consider it for inclusion.
This does not stop you or Gitlab to use pip with your favorite Pytest version.
In that this does not lead to a backwards incompatible change (like we had previously), this falls in to the category of changes that fix problems some people see, even if it's not the default case. So yes, I will pick this up as part of picking up general fixes.
And as I've thrown this at everything-new (to see what happens there) + sandbox, as well as my regular lab of testing with the old version and everything is fine:
Signature · 8 lines
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/20210128/3e0629ca/attachment.sig>
PATCH 1/1 test: correct entry point to pytest
Quoted 2 lines · Tom Rini
Quoted 1 line · Heinrich Schuchardt
On 1/28/21 5:17 PM, Tom Rini wrote:
...
Quoted 7 lines
Quoted 7 lines
As you have read in the replies to that discussion it is not only me who due to security considerations will not run pip on his private computer but wants to use the packages from the distro.
This patch does not break anything. Hence I would appreciate if you could consider it for inclusion.
Quoted 7 lines
Quoted 2 lines
This does not stop you or Gitlab to use pip with your favorite Pytest version.
In that this does not lead to a backwards incompatible change (like we had previously), this falls in to the category of changes that fix problems some people see, even if it's not the default case. So yes, I will pick this up as part of picking up general fixes.
Thanks, Tom!
Quoted 5 lines
And as I've thrown this at everything-new (to see what happens there) + sandbox, as well as my regular lab of testing with the old version and everything is fine:
Tested-by Tom Rini <[email protected]>
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 1/1 test: correct entry point to pytest
In reply to Heinrich SchuchardtQuoted 24 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas changed as follows:Pytest 4.6.1:
[options.entry_points]
console_scripts=
pytest=pytest:main
py.test=pytest:mainPytest 6.0.2:
[options.entry_points]
console_scripts=
pytest=pytest:console_main
py.test=pytest:console_main
Quoted 6 lines
The new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.
Thanks for the patch!
And +1 that we shouldn't avoid the package == version as much as possible. Distros provide a version and if Python doesn't have a capability to provide a way how to do above conditionally to the version, then probably we have to drop Python crap and use better language for the test cases that must be robust.
Quoted 29 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)test/py/test.py +5
-6@@ -10,11 +10,11 @@ import os import os.path import sys +import pytest from pkg_resources import load_entry_point -# argv; py.test test_directory_name user-supplied-arguments -args = [os.path.dirname(__file__) + '/tests'] -args.extend(sys.argv) - if __name__ == '__main__': - sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) + # argv; py.test test_directory_name user-supplied-arguments + args = [os.path.dirname(__file__) + '/tests'] + args.extend(sys.argv) + sys.exit(pytest.main(args)) --2.29.2
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 1/1 test: correct entry point to pytest
In reply to Heinrich SchuchardtQuoted 24 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas changed as follows:Pytest 4.6.1:
[options.entry_points]
console_scripts=
pytest=pytest:main
py.test=pytest:mainPytest 6.0.2:
[options.entry_points]
console_scripts=
pytest=pytest:console_main
py.test=pytest:console_main
Quoted 5 lines
The new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.
Quoted 29 lines
Signed-off-by Heinrich Schuchardt <[email protected]>--- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)test/py/test.py +5
-6@@ -10,11 +10,11 @@ import os import os.path import sys +import pytest from pkg_resources import load_entry_point -# argv; py.test test_directory_name user-supplied-arguments -args = [os.path.dirname(__file__) + '/tests'] -args.extend(sys.argv) - if __name__ == '__main__': - sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) + # argv; py.test test_directory_name user-supplied-arguments + args = [os.path.dirname(__file__) + '/tests'] + args.extend(sys.argv) + sys.exit(pytest.main(args)) --2.29.2
Signature · 2 lines
With Best Regards, Andy Shevchenko
PATCH 1/1 test: correct entry point to pytest
In reply to Heinrich SchuchardtQuoted 26 lines · Heinrich Schuchardt
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 givenThe definition of
console_scriptshas 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_mainThe new function
console_main()has a comment:
"This function is not meant for programmable use; usemain()"
Quoted 6 lines
Hence let's call
pytest.main()directly.
Move args processing into the__main__paragraph.Signed-off-by Heinrich Schuchardt <[email protected]>Tested-by Andy Shevchenko <[email protected]>Tested-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
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>