osc-lib 3.1.0__py3-none-any.whl → 4.0.0__py3-none-any.whl

osc_lib/tests/cli/test_parseractions.py

@@ -21,7 +21,7 @@ from osc_lib.tests import utils
 
 class TestKeyValueAction(utils.TestCase):
     def setUp(self):
-        super(TestKeyValueAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -68,14 +68,12 @@ class TestKeyValueAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
 
 class TestKeyValueAppendAction(utils.TestCase):
     def setUp(self):
-        super(TestKeyValueAppendAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -129,14 +127,12 @@ class TestKeyValueAppendAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
 
 class TestMultiKeyValueAction(utils.TestCase):
     def setUp(self):
-        super(TestMultiKeyValueAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -213,13 +209,11 @@ class TestMultiKeyValueAction(utils.TestCase):
             ],
         ]
         for data in data_list:
-            self.assertRaises(
-                argparse.ArgumentTypeError, self.parser.parse_args, data
-            )
+            self.assertRaises(SystemExit, self.parser.parse_args, data)
 
     def test_error_values_without_comma(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -229,7 +223,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
     def test_missing_key(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -239,7 +233,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
     def test_invalid_key(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             [
                 '--test',
@@ -278,7 +272,7 @@ class TestMultiKeyValueAction(utils.TestCase):
 
 class TestMultiKeyValueCommaAction(utils.TestCase):
     def setUp(self):
-        super(TestMultiKeyValueCommaAction, self).setUp()
+        super().setUp()
         self.parser = argparse.ArgumentParser()
 
         # Typical usage
@@ -361,21 +355,16 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         ]
         self.assertCountEqual(expect, actual)
 
-        try:
-            results = self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,bbb',
-                    '--test',
-                    'opt2=ccc',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                'Missing required keys req1.\nRequired keys are: req1',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            [
+                '--test',
+                'req1=aaa,bbb',
+                '--test',
+                'opt2=ccc',
+            ],
+        )
 
     def test_mkvca_multiples(self):
         results = self.parser.parse_args(
@@ -431,75 +420,34 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
         self.assertCountEqual(expect, actual)
 
     def test_mkvca_invalid_key(self):
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,bbb=',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'Invalid keys bbb specified.\nValid keys are:',
-                str(e),
-            )
-
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'nnn=aaa',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'Invalid keys nnn specified.\nValid keys are:',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'req1=aaa,bbb='],
+        )
+
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'nnn=aaa'],
+        )
 
     def test_mkvca_value_no_key(self):
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'req1=aaa,=bbb',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                "A key must be specified before '=': =bbb",
-                str(e),
-            )
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    '=nnn',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertEqual(
-                "A key must be specified before '=': =nnn",
-                str(e),
-            )
-
-        try:
-            self.parser.parse_args(
-                [
-                    '--test',
-                    'nnn',
-                ]
-            )
-            self.fail('ArgumentTypeError should be raised')
-        except argparse.ArgumentTypeError as e:
-            self.assertIn(
-                'A key=value pair is required:',
-                str(e),
-            )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'req1=aaa,=bbb'],
+        )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', '=nnn'],
+        )
+        self.assertRaises(
+            SystemExit,
+            self.parser.parse_args,
+            ['--test', 'nnn'],
+        )
 
     def test_mkvca_required_keys_not_list(self):
         self.assertRaises(
@@ -532,7 +480,7 @@ class TestMultiKeyValueCommaAction(utils.TestCase):
 
 class TestNonNegativeAction(utils.TestCase):
     def setUp(self):
-        super(TestNonNegativeAction, self).setUp()
+        super().setUp()
 
         self.parser = argparse.ArgumentParser()
 
@@ -546,7 +494,7 @@ class TestNonNegativeAction(utils.TestCase):
 
     def test_negative_values(self):
         self.assertRaises(
-            argparse.ArgumentTypeError,
+            SystemExit,
             self.parser.parse_args,
             "--foo -1".split(),
         )

osc_lib/tests/command/test_timing.py

@@ -27,7 +27,7 @@ timing_url = 'http://localhost:5000'
 timing_elapsed = 0.872809
 
 
-class FakeGenericClient(object):
+class FakeGenericClient:
     def __init__(self, **kwargs):
         self.auth_token = kwargs['token']
         self.management_url = kwargs['endpoint']
@@ -40,7 +40,7 @@ class TestTiming(utils.TestCommand):
     )
 
     def setUp(self):
-        super(TestTiming, self).setUp()
+        super().setUp()
 
         self.app.timing_data = []
 

osc_lib/tests/fakes.py

@@ -60,12 +60,12 @@ def to_unicode_dict(catalog_dict):
     elif isinstance(catalog_dict, list):
         return [to_unicode_dict(element) for element in catalog_dict]
     elif isinstance(catalog_dict, str):
-        return catalog_dict + u""
+        return catalog_dict + ""
     else:
         return catalog_dict
 
 
-class FakeStdout(object):
+class FakeStdout:
     def __init__(self):
         self.content = []
 
@@ -79,7 +79,7 @@ class FakeStdout(object):
         return result
 
 
-class FakeLog(object):
+class FakeLog:
     def __init__(self):
         self.messages = {}
 
@@ -99,7 +99,7 @@ class FakeLog(object):
         self.messages['critical'] = msg
 
 
-class FakeApp(object):
+class FakeApp:
     def __init__(self, _stdout, _log):
         self.stdout = _stdout
         self.client_manager = None
@@ -110,12 +110,12 @@ class FakeApp(object):
         self.log = _log
 
 
-class FakeOptions(object):
+class FakeOptions:
     def __init__(self, **kwargs):
         self.os_beta_command = False
 
 
-class FakeClientManager(object):
+class FakeClientManager:
     def __init__(self):
         self.compute = None
         self.identity = None
@@ -139,7 +139,7 @@ class FakeClientManager(object):
         }
 
 
-class FakeModule(object):
+class FakeModule:
     def __init__(self, name, version):
         self.name = name
         self.__version__ = version
@@ -148,7 +148,7 @@ class FakeModule(object):
         self.version.__version__ = version
 
 
-class FakeResource(object):
+class FakeResource:
     def __init__(self, manager=None, info=None, loaded=False, methods=None):
         """Set attributes and methods for a resource.
 
@@ -191,8 +191,8 @@ class FakeResource(object):
         reprkeys = sorted(
             k for k in self.__dict__.keys() if k[0] != '_' and k != 'manager'
         )
-        info = ", ".join("%s=%s" % (k, getattr(self, k)) for k in reprkeys)
-        return "<%s %s>" % (self.__class__.__name__, info)
+        info = ", ".join(f"{k}={getattr(self, k)}" for k in reprkeys)
+        return f"<{self.__class__.__name__} {info}>"
 
     def keys(self):
         return self._info.keys()

osc_lib/tests/test_clientmanager.py

@@ -49,7 +49,7 @@ AUTH_DICT = {
 auth.get_options_list()
 
 
-class Container(object):
+class Container:
     attr = clientmanager.ClientCache(lambda x: object())
     buggy_attr = clientmanager.ClientCache(lambda x: x.foo)
 

osc_lib/tests/test_logs.py

@@ -76,7 +76,7 @@ class TestFileFormatter(utils.TestCase):
         )
 
     def test_options(self):
-        class Opts(object):
+        class Opts:
             cloud = 'cloudy'
             os_project_name = 'projecty'
             username = 'usernamey'
@@ -107,7 +107,7 @@ class TestFileFormatter(utils.TestCase):
 
 class TestLogConfigurator(utils.TestCase):
     def setUp(self):
-        super(TestLogConfigurator, self).setUp()
+        super().setUp()
         self.options = mock.Mock()
         self.options.verbose_level = 1
         self.options.log_file = None

osc_lib/tests/test_shell.py

@@ -123,7 +123,7 @@ class TestShellArgV(utils.TestShell):
     """Test the deferred help flag"""
 
     def setUp(self):
-        super(TestShellArgV, self).setUp()
+        super().setUp()
 
     def test_shell_argv(self):
         """Test argv decoding
@@ -148,14 +148,14 @@ class TestShellArgV(utils.TestShell):
 
             # When shell.main() gets sys.argv itself it should be decoded
             shell.main()
-            self.assertEqual(type(u'x'), type(self.app.call_args[0][0][0]))
+            self.assertEqual(str, type(self.app.call_args[0][0][0]))
 
 
 class TestShellHelp(utils.TestShell):
     """Test the deferred help flag"""
 
     def setUp(self):
-        super(TestShellHelp, self).setUp()
+        super().setUp()
         self.useFixture(utils.EnvFixture())
 
     @testtools.skip("skip until bug 1444983 is resolved")
@@ -182,7 +182,7 @@ class TestShellOptions(utils.TestShell):
     """
 
     def setUp(self):
-        super(TestShellOptions, self).setUp()
+        super().setUp()
         self.useFixture(utils.EnvFixture())
 
     def test_empty_auth(self):
@@ -213,7 +213,7 @@ class TestShellCli(utils.TestShell):
     """
 
     def setUp(self):
-        super(TestShellCli, self).setUp()
+        super().setUp()
         env = {}
         self.useFixture(utils.EnvFixture(env.copy()))
 
@@ -288,19 +288,19 @@ class TestShellCli(utils.TestShell):
 
         # Default
         utils.fake_execute(_shell, "module list")
-        self.assertEqual('', _shell.options.cert)
-        self.assertEqual('', _shell.options.key)
+        self.assertIsNone(_shell.options.cert)
+        self.assertIsNone(_shell.options.key)
         self.assertIsNone(_shell.client_manager.cert)
 
         # --os-cert
         utils.fake_execute(_shell, "--os-cert mycert module list")
         self.assertEqual('mycert', _shell.options.cert)
-        self.assertEqual('', _shell.options.key)
+        self.assertIsNone(_shell.options.key)
         self.assertEqual('mycert', _shell.client_manager.cert)
 
         # --os-key
         utils.fake_execute(_shell, "--os-key mickey module list")
-        self.assertEqual('', _shell.options.cert)
+        self.assertIsNone(_shell.options.cert)
         self.assertEqual('mickey', _shell.options.key)
         self.assertIsNone(_shell.client_manager.cert)
 
@@ -465,7 +465,7 @@ class TestShellCliPrecedence(utils.TestShell):
     """Test option precedencr order"""
 
     def setUp(self):
-        super(TestShellCliPrecedence, self).setUp()
+        super().setUp()
         env = {
             'OS_CLOUD': 'megacloud',
             'OS_REGION_NAME': 'occ-env',

osc_lib/tests/utils/__init__.py

@@ -14,7 +14,6 @@
 #   under the License.
 #
 
-import contextlib
 import copy
 import json as jsonutils
 import os
@@ -108,33 +107,15 @@ class TestCase(testtools.TestCase):
 
         if m.called:
             if not msg:
-                msg = 'method %s should not have been called' % m
+                msg = f'method {m} should not have been called'
             self.fail(msg)
 
-    @contextlib.contextmanager
-    def subTest(self, *args, **kwargs):
-        """This is a wrapper to unittest's subTest method.
-
-        This wrapper suppresses 2 issues:
-         * lack of support in older Python versions
-         * bug in testtools that breaks support for all versions
-        """
-        try:
-            with super(TestCase, self).subTest(*args, **kwargs):
-                yield
-        except TypeError:
-            raise
-        except AttributeError:
-            # TODO(elhararb): remove this except clause when subTest is
-            #                 enabled in testtools
-            yield
-
 
 class TestCommand(TestCase):
     """Test cliff command classes"""
 
     def setUp(self):
-        super(TestCommand, self).setUp()
+        super().setUp()
         # Build up a fake app
         self.fake_stdout = fakes.FakeStdout()
         self.fake_log = fakes.FakeLog()
@@ -201,7 +182,7 @@ class TestClientManager(TestCase):
     }
 
     def setUp(self):
-        super(TestClientManager, self).setUp()
+        super().setUp()
         self.mock = mock.Mock()
         self.requests = self.useFixture(fixture.Fixture())
         # fake v2password token retrieval
@@ -319,7 +300,7 @@ class TestShell(TestCase):
     shell_class_name = "osc_lib.shell.OpenStackShell"
 
     def setUp(self):
-        super(TestShell, self).setUp()
+        super().setUp()
         self.shell_class = importutils.import_class(self.shell_class_name)
         self.cmd_patch = mock.patch(self.shell_class_name + ".run_subcommand")
         self.cmd_save = self.cmd_patch.start()
@@ -349,7 +330,7 @@ class TestShell(TestCase):
                 self.assertEqual(
                     default_args[k],
                     vars(_shell.options)[k],
-                    "%s does not match" % k,
+                    f"{k} does not match",
                 )
 
     def _assert_cloud_region_arg(self, cmd_options, default_args):
@@ -377,7 +358,7 @@ class TestShell(TestCase):
                 self.assertEqual(
                     default_args[k],
                     vars(opts)[k],
-                    "%s does not match" % k,
+                    f"{k} does not match",
                 )
 
     def _test_options_init_app(self, test_opts):

osc_lib/tests/utils/test_tags.py

@@ -13,6 +13,7 @@
 #   under the License.
 
 import argparse
+import functools
 import sys
 from unittest import mock
 
@@ -27,7 +28,9 @@ def help_enhancer(_h):
 
 class TestTags(test_utils.TestCase):
     def test_add_tag_filtering_option_to_parser(self):
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         tags.add_tag_filtering_option_to_parser(parser, 'test')
 
         parsed_args = parser.parse_args(
@@ -60,7 +63,9 @@ class TestTags(test_utils.TestCase):
         self.assertCountEqual(expected, actual)
 
     def test_get_tag_filtering_args(self):
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         tags.add_tag_filtering_option_to_parser(parser, 'test')
 
         parsed_args = parser.parse_args(
@@ -86,7 +91,9 @@ class TestTags(test_utils.TestCase):
         self.assertEqual(expected, args)
 
     def test_add_tag_option_to_parser_for_create(self):
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         tags.add_tag_option_to_parser_for_create(parser, 'test')
 
         # Test that --tag and --no-tag are mutually exclusive
@@ -105,7 +112,9 @@ class TestTags(test_utils.TestCase):
         self.assertCountEqual(expected, actual)
 
     def test_add_tag_option_to_parser_for_set(self):
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         tags.add_tag_option_to_parser_for_set(parser, 'test')
 
         parsed_args = parser.parse_args(['--tag', 'tag1'])
@@ -119,7 +128,9 @@ class TestTags(test_utils.TestCase):
         self.assertCountEqual(expected, actual)
 
     def test_add_tag_option_to_parser_for_unset(self):
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         tags.add_tag_option_to_parser_for_unset(parser, 'test')
 
         # Test that --tag and --all-tag are mutually exclusive
@@ -209,11 +220,15 @@ class TestTagHelps(test_utils.TestCase):
             options_name = 'options'
         else:
             options_name = 'optional arguments'
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         meth(parser, 'test')
         self.assertEqual(exp_normal % options_name, parser.format_help())
 
-        parser = argparse.ArgumentParser()
+        parser = argparse.ArgumentParser(
+            formatter_class=functools.partial(argparse.HelpFormatter, width=78)
+        )
         meth(parser, 'test', enhance_help=help_enhancer)
         self.assertEqual(exp_enhanced % options_name, parser.format_help())
 

osc_lib/tests/utils/test_utils.py

@@ -368,7 +368,7 @@ class TestUtils(test_utils.TestCase):
         self.assertFalse(utils.is_ascii(b'\xe2'))
 
     def test_is_ascii_string(self):
-        self.assertFalse(utils.is_ascii(u'\u2665'))
+        self.assertFalse(utils.is_ascii('\u2665'))
 
     def test_format_size(self):
         self.assertEqual("999", utils.format_size(999))
@@ -460,11 +460,6 @@ class TestUtils(test_utils.TestCase):
         self.assertEqual('fake-id', res_id)
         return res_attr
 
-    def test_get_item_properties_with_format_func(self):
-        formatters = {'attr': utils.format_list}
-        res_attr = self._test_get_item_properties_with_formatter(formatters)
-        self.assertEqual(utils.format_list(['a', 'b']), res_attr)
-
     def test_get_item_properties_with_formattable_column(self):
         formatters = {'attr': format_columns.ListColumn}
         res_attr = self._test_get_item_properties_with_formatter(formatters)
@@ -479,11 +474,6 @@ class TestUtils(test_utils.TestCase):
         self.assertEqual('fake-id', res_id)
         return res_attr
 
-    def test_get_dict_properties_with_format_func(self):
-        formatters = {'attr': utils.format_list}
-        res_attr = self._test_get_dict_properties_with_formatter(formatters)
-        self.assertEqual(utils.format_list(['a', 'b']), res_attr)
-
     def test_get_dict_properties_with_formattable_column(self):
         formatters = {'attr': format_columns.ListColumn}
         res_attr = self._test_get_dict_properties_with_formatter(formatters)
@@ -544,7 +534,7 @@ class NoUniqueMatch(Exception):
 
 class TestFindResource(test_utils.TestCase):
     def setUp(self):
-        super(TestFindResource, self).setUp()
+        super().setUp()
         self.name = 'legos'
         self.expected = mock.Mock()
         self.manager = mock.Mock()
@@ -711,7 +701,7 @@ class TestFindResource(test_utils.TestCase):
             self.name,
         )
         self.assertEqual(
-            "More than one resource exists " "with the name or ID 'legos'.",
+            "More than one resource exists with the name or ID 'legos'.",
             str(result),
         )
         self.manager.get.assert_called_with(self.name)
@@ -920,7 +910,7 @@ class TestAssertItemEqual(test_utils.TestCommand):
 
 class TestSDKUtils(test_utils.TestCase):
     def setUp(self):
-        super(TestSDKUtils, self).setUp()
+        super().setUp()
 
     def _test_get_osc_show_columns_for_sdk_resource(
         self,