Clément
1605f29413
python3.14 introduced a breaking change which caused a test to fail. A fix has been commited upstream in a pull request by the author, but has since been kept unmerged patch created with: ``` wget https://github.com/neithere/argh/pull/240/commits/699568ad674c5ea26d361202c386a8a8a82ec8ad.patch filterdiff -i a/tests/test_integration.py -i b/tests/test_integration.py 699568ad674c5ea26d361202c386a8a8a82ec8ad.patch > pkgs/development/python-modules/argh/pr240-699568ad-06-01-2025-test_integration.patch ```
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
diff --git a/tests/test_integration.py b/tests/test_integration.py
|
|
index 8839265..6fc8a17 100644
|
|
--- a/tests/test_integration.py
|
|
+++ b/tests/test_integration.py
|
|
@@ -17,7 +17,7 @@
|
|
from argh.utils import unindent
|
|
|
|
from .base import CmdResult as R
|
|
-from .base import DebugArghParser, get_usage_string, run
|
|
+from .base import DebugArghParser, run
|
|
|
|
if sys.version_info < (3, 10):
|
|
HELP_OPTIONS_LABEL = "optional arguments"
|
|
@@ -796,11 +796,17 @@ def func():
|
|
parser = DebugArghParser()
|
|
parser.set_default_command(func)
|
|
|
|
- assert unindent(func.__doc__) in parser.format_help()
|
|
+ docstring = func.__doc__
|
|
+ assert docstring
|
|
+ assert unindent(docstring) in parser.format_help()
|
|
|
|
|
|
def test_prog(capsys: pytest.CaptureFixture[str]):
|
|
- "Program name propagates from sys.argv[0]"
|
|
+ """
|
|
+ Program name propagates to the usage string.
|
|
+ It's not just sys.argv[0], the logic is a bit more complicated in argparse,
|
|
+ so we just reuse whatever it has produced.
|
|
+ """
|
|
|
|
def cmd(*, foo=1):
|
|
return foo
|
|
@@ -808,10 +814,12 @@ def cmd(*, foo=1):
|
|
parser = DebugArghParser()
|
|
parser.add_commands([cmd])
|
|
|
|
- usage = get_usage_string()
|
|
+ usage = f"usage: {parser.prog} [-h]"
|
|
|
|
- assert run(parser, "-h", exit=True) == 0
|
|
+ exit_code = run(parser, "-h", exit=True)
|
|
captured = capsys.readouterr()
|
|
+
|
|
+ assert exit_code == 0
|
|
assert captured.out.startswith(usage)
|
|
|
|
|
|
@@ -822,8 +830,6 @@ def cmd(*, foo=1):
|
|
parser = DebugArghParser()
|
|
parser.set_default_command(cmd)
|
|
|
|
- get_usage_string("[-f FOO]")
|
|
-
|
|
assert run(parser, "--foo 1") == R(out="1\n", err="")
|
|
assert run(parser, "--bar 1", exit=True) == "unrecognized arguments: --bar 1"
|
|
assert run(parser, "--bar 1", exit=False, kwargs={"skip_unknown_args": True}) == R(
|