#11906 Make test_argparse work interactively by removing extra space
in comparison string that argparse does not add when program name is blank.
This commit is contained in:
parent
df4c986f9e
commit
cfe6deb6f7
|
@ -2135,8 +2135,9 @@ class TestParentParsers(TestCase):
|
||||||
parents = [self.abcd_parent, self.wxyz_parent]
|
parents = [self.abcd_parent, self.wxyz_parent]
|
||||||
parser = ErrorRaisingArgumentParser(parents=parents)
|
parser = ErrorRaisingArgumentParser(parents=parents)
|
||||||
parser_help = parser.format_help()
|
parser_help = parser.format_help()
|
||||||
|
progname = self.main_program
|
||||||
self.assertEqual(parser_help, textwrap.dedent('''\
|
self.assertEqual(parser_help, textwrap.dedent('''\
|
||||||
usage: {} [-h] [-b B] [--d D] [--w W] [-y Y] a z
|
usage: {}{}[-h] [-b B] [--d D] [--w W] [-y Y] a z
|
||||||
|
|
||||||
positional arguments:
|
positional arguments:
|
||||||
a
|
a
|
||||||
|
@ -2152,7 +2153,7 @@ class TestParentParsers(TestCase):
|
||||||
|
|
||||||
x:
|
x:
|
||||||
-y Y
|
-y Y
|
||||||
'''.format(self.main_program)))
|
'''.format(progname, ' ' if progname else '' )))
|
||||||
|
|
||||||
def test_groups_parents(self):
|
def test_groups_parents(self):
|
||||||
parent = ErrorRaisingArgumentParser(add_help=False)
|
parent = ErrorRaisingArgumentParser(add_help=False)
|
||||||
|
@ -2168,8 +2169,9 @@ class TestParentParsers(TestCase):
|
||||||
['-y', 'Y', '-z', 'Z'])
|
['-y', 'Y', '-z', 'Z'])
|
||||||
|
|
||||||
parser_help = parser.format_help()
|
parser_help = parser.format_help()
|
||||||
|
progname = self.main_program
|
||||||
self.assertEqual(parser_help, textwrap.dedent('''\
|
self.assertEqual(parser_help, textwrap.dedent('''\
|
||||||
usage: {} [-h] [-w W] [-x X] [-y Y | -z Z]
|
usage: {}{}[-h] [-w W] [-x X] [-y Y | -z Z]
|
||||||
|
|
||||||
optional arguments:
|
optional arguments:
|
||||||
-h, --help show this help message and exit
|
-h, --help show this help message and exit
|
||||||
|
@ -2181,7 +2183,7 @@ class TestParentParsers(TestCase):
|
||||||
|
|
||||||
-w W
|
-w W
|
||||||
-x X
|
-x X
|
||||||
'''.format(self.main_program)))
|
'''.format(progname, ' ' if progname else '' )))
|
||||||
|
|
||||||
# ==============================
|
# ==============================
|
||||||
# Mutually exclusive group tests
|
# Mutually exclusive group tests
|
||||||
|
|
Loading…
Reference in New Issue