commit: 51702de8fc2501c6d51157d9933c21295091e5f1 Author: David Palao <david.palao <AT> gmail <DOT> com> AuthorDate: Fri Jul 7 14:45:20 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Oct 30 03:14:23 2023 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=51702de8
tests/emerge: conftest.py: Fix issue in simple_command fixture Fix issue in simple_command fixture. It was bad-defined in case the argument parser missed the ability to parse intermixed args. Also that command was renamed to make it more descriptive. Signed-off-by: David Palao <david.palao <AT> gmail.com> Signed-off-by: Sam James <sam <AT> gentoo.org> lib/portage/tests/emerge/conftest.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/portage/tests/emerge/conftest.py b/lib/portage/tests/emerge/conftest.py index cfaf18c5f9..7675d4c78c 100644 --- a/lib/portage/tests/emerge/conftest.py +++ b/lib/portage/tests/emerge/conftest.py @@ -209,7 +209,7 @@ _TEST_COMMAND_NAMES_FETCHCOMMAND = [ ] _TEST_COMMAND_NAMES = [ - "emerge_w_parse_intermixed_args", + "emerge -1 dev-libs/A -v dev-libs/B", "emerge --root --quickpkg-direct-root", "emerge --quickpkg-direct-root", "env-update", @@ -475,12 +475,15 @@ def simple_command(playground, binhost, request): test_commands = {} if hasattr(argparse.ArgumentParser, "parse_intermixed_args"): - test_commands["emerge_w_parse_intermixed_args"] = emerge_cmd + ( + parse_intermixed_command = emerge_cmd + ( "--oneshot", "dev-libs/A", "-v", "dev-libs/A", ) + else: + parse_intermixed_command = lambda: ... + test_commands["emerge -1 dev-libs/A -v dev-libs/B"] = parse_intermixed_command test_commands["emerge --root --quickpkg-direct-root"] = emerge_cmd + ( "--usepkgonly",