openstack
/
oslo.config
Code Issues Proposed changes

Fix tests for Python3. 

Change-Id: Ifbf6f52a312929ac07154db8eeee976b0ab0d46a
This commit is contained in:
Cyril Roelandt 2021-08-19 00:26:46 +00:00
parent 1a7bd66a71
commit 88c831cfad
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oslo_config/tests/test_cfg.py
View File

@ -184,7 +184,10 @@ class HelpTestCase(BaseTestCase):
'usage: test [-h] [--config-dir DIR] [--config-file PATH] '
'[--version]',
f.getvalue())
self.assertIn('optional', f.getvalue())
# argparse may generate two different help messages:
# - In Python >=3.10: "options:\n --version"
# - In Python <3.10: "optional arguments:"
self.assertRegex(f.getvalue(), 'option(s|al arguments):')
self.assertIn('-h, --help', f.getvalue())
def test_print_strOpt_with_choices_help(self):
@ -207,7 +210,10 @@ class HelpTestCase(BaseTestCase):
'usage: test [-h] [--aa AA] [--bb BB] [--cc CC] [--config-dir DIR]'
'\n [--config-file PATH] [--version]',
f.getvalue())
self.assertIn('optional', f.getvalue())
# argparse may generate two different help messages:
# - In Python >=3.10: "options:\n --version"
# - In Python <3.10: "optional arguments:"
self.assertRegex(f.getvalue(), 'option(s|al arguments):')
self.assertIn('-h, --help', f.getvalue())
self.assertIn('StrOpt with choices. Allowed values: xx, yy, zz',
f.getvalue())