diff options
Diffstat (limited to 'openstackclient/tests')
18 files changed, 557 insertions, 424 deletions
diff --git a/openstackclient/tests/functional/common/test_availability_zone.py b/openstackclient/tests/functional/common/test_availability_zone.py index f319ffc5..cce1b261 100644 --- a/openstackclient/tests/functional/common/test_availability_zone.py +++ b/openstackclient/tests/functional/common/test_availability_zone.py @@ -14,7 +14,7 @@ from openstackclient.tests.functional import base class AvailabilityZoneTests(base.TestCase): - """Functional tests for availability zone. """ + """Functional tests for availability zone.""" def test_availability_zone_list(self): cmd_output = self.openstack( @@ -22,11 +22,5 @@ class AvailabilityZoneTests(base.TestCase): parse_output=True, ) zones = [x['Zone Name'] for x in cmd_output] - self.assertIn( - 'internal', - zones - ) - self.assertIn( - 'nova', - zones - ) + self.assertIn('internal', zones) + self.assertIn('nova', zones) diff --git a/openstackclient/tests/functional/common/test_configuration.py b/openstackclient/tests/functional/common/test_configuration.py index 614b3e46..2a4660a4 100644 --- a/openstackclient/tests/functional/common/test_configuration.py +++ b/openstackclient/tests/functional/common/test_configuration.py @@ -23,17 +23,13 @@ class ConfigurationTests(base.TestCase): """Functional test for configuration.""" def test_configuration_show(self): - # Test show without option raw_output = self.openstack('configuration show') items = self.parse_listing(raw_output) self.assert_table_structure(items, BASIC_CONFIG_HEADERS) cmd_output = self.openstack('configuration show', parse_output=True) - self.assertEqual( - configuration.REDACTED, - cmd_output['auth.password'] - ) + self.assertEqual(configuration.REDACTED, cmd_output['auth.password']) self.assertIn( 'auth.password', cmd_output.keys(), @@ -41,30 +37,25 @@ class ConfigurationTests(base.TestCase): # Test show --mask cmd_output = self.openstack( - 'configuration show --mask', parse_output=True, - ) - self.assertEqual( - configuration.REDACTED, - cmd_output['auth.password'] + 'configuration show --mask', + parse_output=True, ) + self.assertEqual(configuration.REDACTED, cmd_output['auth.password']) # Test show --unmask cmd_output = self.openstack( - 'configuration show --unmask', parse_output=True, + 'configuration show --unmask', + parse_output=True, ) # If we are using os-client-config, this will not be set. Rather than # parse clouds.yaml to get the right value, just make sure # we are not getting redacted. passwd = os.environ.get('OS_PASSWORD') if passwd: - self.assertEqual( - passwd, - cmd_output['auth.password'] - ) + self.assertEqual(passwd, cmd_output['auth.password']) else: self.assertNotEqual( - configuration.REDACTED, - cmd_output['auth.password'] + configuration.REDACTED, cmd_output['auth.password'] ) @@ -72,7 +63,6 @@ class ConfigurationTestsNoAuth(base.TestCase): """Functional test for configuration with no auth""" def test_configuration_show(self): - # Test show without option raw_output = self.openstack( 'configuration show', diff --git a/openstackclient/tests/functional/common/test_help.py b/openstackclient/tests/functional/common/test_help.py index e84c22e0..0df3b5be 100644 --- a/openstackclient/tests/functional/common/test_help.py +++ b/openstackclient/tests/functional/common/test_help.py @@ -27,8 +27,10 @@ class HelpTests(base.TestCase): ('server create', 'Create a new server'), ('server delete', 'Delete server(s)'), ('server dump create', 'Create a dump file in server(s)'), - ('server image create', - 'Create a new server disk image from an existing server'), + ( + 'server image create', + 'Create a new server disk image from an existing server', + ), ('server list', 'List servers'), ('server lock', 'Lock server(s)'), ('server migrate', 'Migrate server to different host'), @@ -51,7 +53,7 @@ class HelpTests(base.TestCase): ('server unpause', 'Unpause server(s)'), ('server unrescue', 'Restore server from rescue mode'), ('server unset', 'Unset server properties'), - ('server unshelve', 'Unshelve server(s)') + ('server unshelve', 'Unshelve server(s)'), ] def test_server_commands_main_help(self): @@ -59,10 +61,14 @@ class HelpTests(base.TestCase): raw_output = self.openstack('help') for command, description in self.SERVER_COMMANDS: msg = 'Command: %s not found in help output:\n%s' % ( - command, raw_output) + command, + raw_output, + ) self.assertIn(command, raw_output, msg) msg = 'Description: %s not found in help output:\n%s' % ( - description, raw_output) + description, + raw_output, + ) self.assertIn(description, raw_output, msg) def test_server_only_help(self): diff --git a/openstackclient/tests/functional/common/test_module.py b/openstackclient/tests/functional/common/test_module.py index 967d3b49..0cb37391 100644 --- a/openstackclient/tests/functional/common/test_module.py +++ b/openstackclient/tests/functional/common/test_module.py @@ -18,13 +18,9 @@ from openstackclient.tests.functional import base class ModuleTest(base.TestCase): """Functional tests for openstackclient module list output.""" - CLIENTS = ['openstackclient', - 'keystoneclient', - 'novaclient', - 'openstack'] + CLIENTS = ['openstackclient', 'keystoneclient', 'novaclient', 'openstack'] - LIBS = ['osc_lib', - 'keystoneauth1'] + LIBS = ['osc_lib', 'keystoneauth1'] def test_module_list(self): # Test module list @@ -42,6 +38,7 @@ class ModuleTest(base.TestCase): class CommandTest(base.TestCase): """Functional tests for openstackclient command list.""" + GROUPS = [ 'openstack.volume.v3', 'openstack.network.v2', @@ -59,13 +56,7 @@ class CommandTest(base.TestCase): self.assertIn(one_group, group_names) def test_command_list_with_group(self): - input_groups = [ - 'volume', - 'network', - 'image', - 'identity', - 'compute.v2' - ] + input_groups = ['volume', 'network', 'image', 'identity', 'compute.v2'] for each_input in input_groups: cmd_output = self.openstack( 'command list --group %s' % each_input, diff --git a/openstackclient/tests/functional/common/test_quota.py b/openstackclient/tests/functional/common/test_quota.py index 6e48df1d..5cc1b4ee 100644 --- a/openstackclient/tests/functional/common/test_quota.py +++ b/openstackclient/tests/functional/common/test_quota.py @@ -30,8 +30,9 @@ class QuotaTests(base.TestCase): def setUpClass(cls): super(QuotaTests, cls).setUpClass() cls.haz_network = cls.is_service_enabled('network') - cls.PROJECT_NAME =\ - cls.get_openstack_configuration_value('auth.project_name') + cls.PROJECT_NAME = cls.get_openstack_configuration_value( + 'auth.project_name' + ) def test_quota_list_details_compute(self): expected_headers = ["Resource", "In Use", "Reserved", "Limit"] @@ -111,9 +112,9 @@ class QuotaTests(base.TestCase): if self.haz_network: network_option = "--routers 21 " self.openstack( - 'quota set --cores 31 --backups 41 ' + - network_option + - self.PROJECT_NAME + 'quota set --cores 31 --backups 41 ' + + network_option + + self.PROJECT_NAME ) cmd_output = self.openstack( 'quota show ' + self.PROJECT_NAME, @@ -151,8 +152,7 @@ class QuotaTests(base.TestCase): def test_quota_set_class(self): self.openstack( - 'quota set --key-pairs 33 --snapshots 43 ' + - '--class default' + 'quota set --key-pairs 33 --snapshots 43 ' + '--class default' ) cmd_output = self.openstack( 'quota show --class default', @@ -194,8 +194,12 @@ class QuotaTests(base.TestCase): 'quota list --network', parse_output=True, ) - self.addCleanup(self._restore_quota_limit, 'network', - cmd_output[0]['Networks'], self.PROJECT_NAME) + self.addCleanup( + self._restore_quota_limit, + 'network', + cmd_output[0]['Networks'], + self.PROJECT_NAME, + ) self.openstack('quota set --networks 40 ' + self.PROJECT_NAME) cmd_output = self.openstack( @@ -207,12 +211,16 @@ class QuotaTests(base.TestCase): # That will ensure we have at least two networks in the system. for _ in range(2): - self.openstack('network create --project %s %s' % - (self.PROJECT_NAME, uuid.uuid4().hex)) + self.openstack( + 'network create --project %s %s' + % (self.PROJECT_NAME, uuid.uuid4().hex) + ) - self.assertRaises(exceptions.CommandFailed, self.openstack, - 'quota set --networks 1 --no-force ' + - self.PROJECT_NAME) + self.assertRaises( + exceptions.CommandFailed, + self.openstack, + 'quota set --networks 1 --no-force ' + self.PROJECT_NAME, + ) def test_quota_network_set_with_force(self): self.skipTest('story 2010110') @@ -232,8 +240,12 @@ class QuotaTests(base.TestCase): 'quota list --network', parse_output=True, ) - self.addCleanup(self._restore_quota_limit, 'network', - cmd_output[0]['Networks'], self.PROJECT_NAME) + self.addCleanup( + self._restore_quota_limit, + 'network', + cmd_output[0]['Networks'], + self.PROJECT_NAME, + ) self.openstack('quota set --networks 40 ' + self.PROJECT_NAME) cmd_output = self.openstack( @@ -245,8 +257,10 @@ class QuotaTests(base.TestCase): # That will ensure we have at least two networks in the system. for _ in range(2): - self.openstack('network create --project %s %s' % - (self.PROJECT_NAME, uuid.uuid4().hex)) + self.openstack( + 'network create --project %s %s' + % (self.PROJECT_NAME, uuid.uuid4().hex) + ) self.openstack('quota set --networks 1 --force ' + self.PROJECT_NAME) cmd_output = self.openstack( diff --git a/openstackclient/tests/unit/common/test_availability_zone.py b/openstackclient/tests/unit/common/test_availability_zone.py index 096038ca..99315eae 100644 --- a/openstackclient/tests/unit/common/test_availability_zone.py +++ b/openstackclient/tests/unit/common/test_availability_zone.py @@ -53,7 +53,10 @@ def _build_volume_az_datalist(volume_az, long_datalist=False): datalist = ( volume_az.zoneName, 'available', - '', '', '', '', + '', + '', + '', + '', ) return (datalist,) @@ -70,13 +73,14 @@ def _build_network_az_datalist(network_az, long_datalist=False): network_az.name, network_az.state, network_az.resource, - '', '', '', + '', + '', + '', ) return (datalist,) class TestAvailabilityZone(utils.TestCommand): - def setUp(self): super().setUp() @@ -110,9 +114,9 @@ class TestAvailabilityZone(utils.TestCommand): class TestAvailabilityZoneList(TestAvailabilityZone): - - compute_azs = \ + compute_azs = ( compute_fakes.FakeAvailabilityZone.create_availability_zones() + ) volume_azs = volume_fakes.create_availability_zones(count=1) network_azs = network_fakes.create_availability_zones() @@ -181,14 +185,17 @@ class TestAvailabilityZoneList(TestAvailabilityZone): self.assertEqual(self.long_columnslist, columns) datalist = () for compute_az in self.compute_azs: - datalist += _build_compute_az_datalist(compute_az, - long_datalist=True) + datalist += _build_compute_az_datalist( + compute_az, long_datalist=True + ) for volume_az in self.volume_azs: - datalist += _build_volume_az_datalist(volume_az, - long_datalist=True) + datalist += _build_volume_az_datalist( + volume_az, long_datalist=True + ) for network_az in self.network_azs: - datalist += _build_network_az_datalist(network_az, - long_datalist=True) + datalist += _build_network_az_datalist( + network_az, long_datalist=True + ) self.assertEqual(datalist, tuple(data)) def test_availability_zone_list_compute(self): diff --git a/openstackclient/tests/unit/common/test_clientmanager.py b/openstackclient/tests/unit/common/test_clientmanager.py index a83b1318..165dcc12 100644 --- a/openstackclient/tests/unit/common/test_clientmanager.py +++ b/openstackclient/tests/unit/common/test_clientmanager.py @@ -23,7 +23,6 @@ from openstackclient.tests.unit import fakes class TestClientManager(osc_lib_test_utils.TestClientManager): - def _clientmanager_class(self): """Allow subclasses to override the ClientManager class""" return clientmanager.ClientManager @@ -54,10 +53,12 @@ class TestClientManager(osc_lib_test_utils.TestClientManager): def test_client_manager_network_endpoint_disabled(self): auth_args = copy.deepcopy(self.default_password_auth) - auth_args.update({ - 'user_domain_name': 'default', - 'project_domain_name': 'default', - }) + auth_args.update( + { + 'user_domain_name': 'default', + 'project_domain_name': 'default', + } + ) # v3 fake doesn't have network endpoint client_manager = self._make_clientmanager( auth_args=auth_args, diff --git a/openstackclient/tests/unit/common/test_command.py b/openstackclient/tests/unit/common/test_command.py index 4fde5301..f31c7117 100644 --- a/openstackclient/tests/unit/common/test_command.py +++ b/openstackclient/tests/unit/common/test_command.py @@ -22,18 +22,18 @@ from openstackclient.tests.unit import utils as test_utils class FakeCommand(command.Command): - def take_action(self, parsed_args): pass class TestCommand(test_utils.TestCase): - def test_command_has_logger(self): cmd = FakeCommand(mock.Mock(), mock.Mock()) self.assertTrue(hasattr(cmd, 'log')) - self.assertEqual('openstackclient.tests.unit.common.test_command.' - 'FakeCommand', cmd.log.name) + self.assertEqual( + 'openstackclient.tests.unit.common.test_command.' 'FakeCommand', + cmd.log.name, + ) def test_validate_os_beta_command_enabled(self): cmd = FakeCommand(mock.Mock(), mock.Mock()) @@ -45,5 +45,6 @@ class TestCommand(test_utils.TestCase): cmd.validate_os_beta_command_enabled() cmd.app.options.os_beta_command = False - self.assertRaises(exceptions.CommandError, - cmd.validate_os_beta_command_enabled) + self.assertRaises( + exceptions.CommandError, cmd.validate_os_beta_command_enabled + ) diff --git a/openstackclient/tests/unit/common/test_configuration.py b/openstackclient/tests/unit/common/test_configuration.py index 148228ec..6e114544 100644 --- a/openstackclient/tests/unit/common/test_configuration.py +++ b/openstackclient/tests/unit/common/test_configuration.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils class TestConfiguration(utils.TestCommand): - columns = ( 'auth.password', 'auth.token', diff --git a/openstackclient/tests/unit/common/test_extension.py b/openstackclient/tests/unit/common/test_extension.py index bd90b32d..56b2ccea 100644 --- a/openstackclient/tests/unit/common/test_extension.py +++ b/openstackclient/tests/unit/common/test_extension.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes class TestExtension(utils.TestCommand): - def setUp(self): super().setUp() @@ -61,10 +60,15 @@ class TestExtension(utils.TestCommand): class TestExtensionList(TestExtension): - columns = ('Name', 'Alias', 'Description') - long_columns = ('Name', 'Alias', 'Description', 'Namespace', 'Updated', - 'Links') + long_columns = ( + 'Name', + 'Alias', + 'Description', + 'Namespace', + 'Updated', + 'Links', + ) volume_extension = volume_fakes.create_one_extension() identity_extension = identity_fakes.FakeExtension.create_one_extension() @@ -75,17 +79,20 @@ class TestExtensionList(TestExtension): super().setUp() self.identity_extensions_mock.list.return_value = [ - self.identity_extension] + self.identity_extension + ] self.compute_extensions_mock.return_value = [self.compute_extension] self.volume_extensions_mock.show_all.return_value = [ - self.volume_extension] + self.volume_extension + ] self.network_extensions_mock.return_value = [self.network_extension] # Get the command object to test self.cmd = extension.ListExtension(self.app, None) - def _test_extension_list_helper(self, arglist, verifylist, - expected_data, long=False): + def _test_extension_list_helper( + self, arglist, verifylist, expected_data, long=False + ): parsed_args = self.check_parser(self.cmd, arglist, verifylist) # In base command class Lister in cliff, abstract method take_action() @@ -184,11 +191,13 @@ class TestExtensionList(TestExtension): verifylist = [ ('identity', True), ] - datalist = (( - self.identity_extension.name, - self.identity_extension.alias, - self.identity_extension.description, - ), ) + datalist = ( + ( + self.identity_extension.name, + self.identity_extension.alias, + self.identity_extension.description, + ), + ) self._test_extension_list_helper(arglist, verifylist, datalist) self.identity_extensions_mock.list.assert_called_with() @@ -218,16 +227,19 @@ class TestExtensionList(TestExtension): ('network', True), ('long', True), ] - datalist = (( - self.network_extension.name, - self.network_extension.alias, - self.network_extension.description, - self.network_extension.namespace, - self.network_extension.updated, - self.network_extension.links, - ), ) - self._test_extension_list_helper(arglist, verifylist, datalist, - long=True) + datalist = ( + ( + self.network_extension.name, + self.network_extension.alias, + self.network_extension.description, + self.network_extension.namespace, + self.network_extension.updated, + self.network_extension.links, + ), + ) + self._test_extension_list_helper( + arglist, verifylist, datalist, long=True + ) self.network_extensions_mock.assert_called_with() def test_extension_list_compute(self): @@ -237,11 +249,13 @@ class TestExtensionList(TestExtension): verifylist = [ ('compute', True), ] - datalist = (( - self.compute_extension.name, - self.compute_extension.alias, - self.compute_extension.description, - ), ) + datalist = ( + ( + self.compute_extension.name, + self.compute_extension.alias, + self.compute_extension.description, + ), + ) self._test_extension_list_helper(arglist, verifylist, datalist) self.compute_extensions_mock.assert_called_with() @@ -277,19 +291,19 @@ class TestExtensionList(TestExtension): verifylist = [ ('volume', True), ] - datalist = (( - self.volume_extension.name, - self.volume_extension.alias, - self.volume_extension.description, - ), ) + datalist = ( + ( + self.volume_extension.name, + self.volume_extension.alias, + self.volume_extension.description, + ), + ) self._test_extension_list_helper(arglist, verifylist, datalist) self.volume_extensions_mock.show_all.assert_called_with() class TestExtensionShow(TestExtension): - extension_details = ( - network_fakes.FakeExtension.create_one_extension() - ) + extension_details = network_fakes.FakeExtension.create_one_extension() columns = ( 'alias', @@ -306,7 +320,7 @@ class TestExtensionShow(TestExtension): extension_details.links, extension_details.name, extension_details.namespace, - extension_details.updated + extension_details.updated, ) def setUp(self): @@ -315,14 +329,20 @@ class TestExtensionShow(TestExtension): self.cmd = extension.ShowExtension(self.app, None) self.app.client_manager.network.find_extension = mock.Mock( - return_value=self.extension_details) + return_value=self.extension_details + ) def test_show_no_options(self): arglist = [] verifylist = [] - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) def test_show_all_options(self): arglist = [ @@ -337,7 +357,8 @@ class TestExtensionShow(TestExtension): columns, data = self.cmd.take_action(parsed_args) self.app.client_manager.network.find_extension.assert_called_with( - self.extension_details.alias, ignore_missing=False) + self.extension_details.alias, ignore_missing=False + ) self.assertEqual(self.columns, columns) self.assertEqual(self.data, data) diff --git a/openstackclient/tests/unit/common/test_limits.py b/openstackclient/tests/unit/common/test_limits.py index e3cdcf45..a29fa415 100644 --- a/openstackclient/tests/unit/common/test_limits.py +++ b/openstackclient/tests/unit/common/test_limits.py @@ -17,20 +17,12 @@ from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes class TestComputeLimits(compute_fakes.TestComputev2): - absolute_columns = [ 'Name', 'Value', ] - rate_columns = [ - "Verb", - "URI", - "Value", - "Remain", - "Unit", - "Next Available" - ] + rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"] def setUp(self): super().setUp() @@ -77,14 +69,7 @@ class TestVolumeLimits(volume_fakes.TestVolume): 'Value', ] - rate_columns = [ - "Verb", - "URI", - "Value", - "Remain", - "Unit", - "Next Available" - ] + rate_columns = ["Verb", "URI", "Value", "Remain", "Unit", "Next Available"] def setUp(self): super().setUp() diff --git a/openstackclient/tests/unit/common/test_logs.py b/openstackclient/tests/unit/common/test_logs.py index 0e710561..4cabd60b 100644 --- a/openstackclient/tests/unit/common/test_logs.py +++ b/openstackclient/tests/unit/common/test_logs.py @@ -23,7 +23,6 @@ from openstackclient.tests.unit import utils class TestContext(utils.TestCase): - def test_log_level_from_options(self): opts = mock.Mock() opts.verbose_level = 0 @@ -70,35 +69,47 @@ class TestContext(utils.TestCase): class TestFileFormatter(utils.TestCase): - def test_nothing(self): formatter = logs._FileFormatter() - self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' - '%(name)s %(message)s'), formatter.fmt) + self.assertEqual( + ( + '%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' + '%(name)s %(message)s' + ), + formatter.fmt, + ) def test_options(self): class Opts(object): cloud = 'cloudy' os_project_name = 'projecty' username = 'usernamey' + options = Opts() formatter = logs._FileFormatter(options=options) - self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' - '%(name)s [cloudy usernamey projecty] %(message)s'), - formatter.fmt) + self.assertEqual( + ( + '%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' + '%(name)s [cloudy usernamey projecty] %(message)s' + ), + formatter.fmt, + ) def test_config(self): config = mock.Mock() config.config = {'cloud': 'cloudy'} config.auth = {'project_name': 'projecty', 'username': 'usernamey'} formatter = logs._FileFormatter(config=config) - self.assertEqual(('%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' - '%(name)s [cloudy usernamey projecty] %(message)s'), - formatter.fmt) + self.assertEqual( + ( + '%(asctime)s.%(msecs)03d %(process)d %(levelname)s ' + '%(name)s [cloudy usernamey projecty] %(message)s' + ), + formatter.fmt, + ) class TestLogConfigurator(utils.TestCase): - def setUp(self): super(TestLogConfigurator, self).setUp() self.options = mock.Mock() @@ -121,7 +132,8 @@ class TestLogConfigurator(utils.TestCase): self.requests_log, self.cliff_log, self.stevedore_log, - self.iso8601_log] + self.iso8601_log, + ] @mock.patch('logging.StreamHandler') @mock.patch('logging.getLogger') @@ -190,7 +202,8 @@ class TestLogConfigurator(utils.TestCase): cloud_config.config = { 'log_file': config_log, 'verbose_level': 1, - 'log_level': 'info'} + 'log_level': 'info', + } file_logger = mock.Mock() file_logger.setFormatter = mock.Mock() file_logger.setLevel = mock.Mock() diff --git a/openstackclient/tests/unit/common/test_module.py b/openstackclient/tests/unit/common/test_module.py index d2e8293f..18ac7c20 100644 --- a/openstackclient/tests/unit/common/test_module.py +++ b/openstackclient/tests/unit/common/test_module.py @@ -52,7 +52,6 @@ MODULES = { class TestCommandList(utils.TestCommand): - def setUp(self): super(TestCommandList, self).setUp() @@ -81,16 +80,14 @@ class TestCommandList(utils.TestCommand): # handling the detection rather than using the hard-code below. collist = ('Command Group', 'Commands') self.assertEqual(collist, columns) - datalist = (( - 'openstack.common', - 'limits show\nextension list' - ),) + datalist = (('openstack.common', 'limits show\nextension list'),) self.assertEqual(datalist, tuple(data)) def test_command_list_with_group_not_found(self): arglist = [ - '--group', 'not_exist', + '--group', + 'not_exist', ] verifylist = [ ('group', 'not_exist'), @@ -105,7 +102,8 @@ class TestCommandList(utils.TestCommand): def test_command_list_with_group(self): arglist = [ - '--group', 'common', + '--group', + 'common', ] verifylist = [ ('group', 'common'), @@ -116,10 +114,7 @@ class TestCommandList(utils.TestCommand): collist = ('Command Group', 'Commands') self.assertEqual(collist, columns) - datalist = (( - 'openstack.common', - 'limits show\nextension list' - ),) + datalist = (('openstack.common', 'limits show\nextension list'),) self.assertEqual(datalist, tuple(data)) @@ -130,7 +125,6 @@ class TestCommandList(utils.TestCommand): clear=True, ) class TestModuleList(utils.TestCommand): - def setUp(self): super(TestModuleList, self).setUp() diff --git a/openstackclient/tests/unit/common/test_parseractions.py b/openstackclient/tests/unit/common/test_parseractions.py index 736cd0b6..7a1b17d7 100644 --- a/openstackclient/tests/unit/common/test_parseractions.py +++ b/openstackclient/tests/unit/common/test_parseractions.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit import utils class TestKeyValueAction(utils.TestCase): - def setUp(self): super(TestKeyValueAction, self).setUp() @@ -37,15 +36,20 @@ class TestKeyValueAction(utils.TestCase): action=parseractions.KeyValueAction, default={'green': '20%', 'format': '#rgb'}, help='Property to store for this volume ' - '(repeat option to set multiple properties)', + '(repeat option to set multiple properties)', ) def test_good_values(self): - results = self.parser.parse_args([ - '--property', 'red=', - '--property', 'green=100%', - '--property', 'blue=50%', - ]) + results = self.parser.parse_args( + [ + '--property', + 'red=', + '--property', + 'green=100%', + '--property', + 'blue=50%', + ] + ) actual = getattr(results, 'property', {}) # All should pass through unmolested @@ -57,13 +61,13 @@ class TestKeyValueAction(utils.TestCase): argparse.ArgumentTypeError, self.parser.parse_args, [ - '--property', 'red', - ] + '--property', + 'red', + ], ) class TestMultiKeyValueAction(utils.TestCase): - def setUp(self): super(TestMultiKeyValueAction, self).setUp() @@ -78,14 +82,18 @@ class TestMultiKeyValueAction(utils.TestCase): default=None, required_keys=['req1', 'req2'], optional_keys=['opt1', 'opt2'], - help='Test' + help='Test', ) def test_good_values(self): - results = self.parser.parse_args([ - '--test', 'req1=aaa,req2=bbb', - '--test', 'req1=,req2=', - ]) + results = self.parser.parse_args( + [ + '--test', + 'req1=aaa,req2=bbb', + '--test', + 'req1=,req2=', + ] + ) actual = getattr(results, 'test', []) expect = [ @@ -103,13 +111,17 @@ class TestMultiKeyValueAction(utils.TestCase): default=None, required_keys=[], optional_keys=[], - help='Test' + help='Test', ) - results = self.parser.parse_args([ - '--test-empty', 'req1=aaa,req2=bbb', - '--test-empty', 'req1=,req2=', - ]) + results = self.parser.parse_args( + [ + '--test-empty', + 'req1=aaa,req2=bbb', + '--test-empty', + 'req1=,req2=', + ] + ) actual = getattr(results, 'test_empty', []) expect = [ @@ -123,8 +135,9 @@ class TestMultiKeyValueAction(utils.TestCase): argparse.ArgumentTypeError, self.parser.parse_args, [ - '--test', 'mmm,nnn=zzz', - ] + '--test', + 'mmm,nnn=zzz', + ], ) def test_error_values_without_comma(self): @@ -132,8 +145,9 @@ class TestMultiKeyValueAction(utils.TestCase): argparse.ArgumentTypeError, self.parser.parse_args, [ - '--test', 'mmmnnn', - ] + '--test', + 'mmmnnn', + ], ) def test_missing_key(self): @@ -141,8 +155,9 @@ class TestMultiKeyValueAction(utils.TestCase): argparse.ArgumentTypeError, self.parser.parse_args, [ - '--test', 'req2=ddd', - ] + '--test', + 'req2=ddd', + ], ) def test_invalid_key(self): @@ -150,8 +165,9 @@ class TestMultiKeyValueAction(utils.TestCase): argparse.ArgumentTypeError, self.parser.parse_args, [ - '--test', 'req1=aaa,req2=bbb,aaa=req1', - ] + '--test', + 'req1=aaa,req2=bbb,aaa=req1', + ], ) def test_required_keys_not_list(self): @@ -165,7 +181,7 @@ class TestMultiKeyValueAction(utils.TestCase): default=None, required_keys={'aaa': 'bbb'}, optional_keys=['opt1', 'opt2'], - help='Test' + help='Test', ) def test_optional_keys_not_list(self): @@ -179,12 +195,11 @@ class TestMultiKeyValueAction(utils.TestCase): default=None, required_keys=['req1', 'req2'], optional_keys={'aaa': 'bbb'}, - help='Test' + help='Test', ) class TestNonNegativeAction(utils.TestCase): - def setUp(self): super(TestNonNegativeAction, self).setUp() @@ -202,21 +217,17 @@ class TestNonNegativeAction(utils.TestCase): self.assertRaises( argparse.ArgumentTypeError, self.parser.parse_args, - "--foo -1".split() + "--foo -1".split(), ) def test_zero_values(self): - results = self.parser.parse_args( - '--foo 0'.split() - ) + results = self.parser.parse_args('--foo 0'.split()) actual = getattr(results, 'foo', None) self.assertEqual(actual, 0) def test_positive_values(self): - results = self.parser.parse_args( - '--foo 1'.split() - ) + results = self.parser.parse_args('--foo 1'.split()) actual = getattr(results, 'foo', None) self.assertEqual(actual, 1) diff --git a/openstackclient/tests/unit/common/test_progressbar.py b/openstackclient/tests/unit/common/test_progressbar.py index a624fc43..47a866b3 100644 --- a/openstackclient/tests/unit/common/test_progressbar.py +++ b/openstackclient/tests/unit/common/test_progressbar.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils class TestProgressBarWrapper(utils.TestCase): - def test_iter_file_display_progress_bar(self): size = 98304 file_obj = io.StringIO('X' * size) @@ -31,10 +30,7 @@ class TestProgressBarWrapper(utils.TestCase): chunk = file_obj.read(chunksize) while chunk: chunk = file_obj.read(chunksize) - self.assertEqual( - '[%s>] 100%%\n' % ('=' * 29), - output.getvalue() - ) + self.assertEqual('[%s>] 100%%\n' % ('=' * 29), output.getvalue()) finally: sys.stdout = saved_stdout diff --git a/openstackclient/tests/unit/common/test_project_cleanup.py b/openstackclient/tests/unit/common/test_project_cleanup.py index 50c434b9..64ecf3ef 100644 --- a/openstackclient/tests/unit/common/test_project_cleanup.py +++ b/openstackclient/tests/unit/common/test_project_cleanup.py @@ -19,7 +19,6 @@ from openstackclient.tests.unit import utils as tests_utils class TestProjectCleanupBase(tests_utils.TestCommand): - def setUp(self): super(TestProjectCleanupBase, self).setUp() @@ -27,7 +26,6 @@ class TestProjectCleanupBase(tests_utils.TestCommand): class TestProjectCleanup(TestProjectCleanupBase): - project = identity_fakes.FakeProject.create_one_project() def setUp(self): @@ -35,34 +33,46 @@ class TestProjectCleanup(TestProjectCleanupBase): self.cmd = project_cleanup.ProjectCleanup(self.app, None) self.project_cleanup_mock = mock.Mock() - self.sdk_connect_as_project_mock = \ - mock.Mock(return_value=self.app.client_manager.sdk_connection) - self.app.client_manager.sdk_connection.project_cleanup = \ + self.sdk_connect_as_project_mock = mock.Mock( + return_value=self.app.client_manager.sdk_connection + ) + self.app.client_manager.sdk_connection.project_cleanup = ( self.project_cleanup_mock - self.app.client_manager.sdk_connection.identity.find_project = \ + ) + self.app.client_manager.sdk_connection.identity.find_project = ( mock.Mock(return_value=self.project) - self.app.client_manager.sdk_connection.connect_as_project = \ + ) + self.app.client_manager.sdk_connection.connect_as_project = ( self.sdk_connect_as_project_mock + ) def test_project_no_options(self): arglist = [] verifylist = [] - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) def test_project_cleanup_with_filters(self): arglist = [ - '--project', self.project.id, - '--created-before', '2200-01-01', - '--updated-before', '2200-01-02' + '--project', + self.project.id, + '--created-before', + '2200-01-01', + '--updated-before', + '2200-01-02', ] verifylist = [ ('dry_run', False), ('auth_project', False), ('project', self.project.id), ('created_before', '2200-01-01'), - ('updated_before', '2200-01-02') + ('updated_before', '2200-01-02'), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) result = None @@ -70,16 +80,12 @@ class TestProjectCleanup(TestProjectCleanupBase): with mock.patch('sys.stdin', StringIO('y')): result = self.cmd.take_action(parsed_args) - self.sdk_connect_as_project_mock.assert_called_with( - self.project) - filters = { - 'created_at': '2200-01-01', - 'updated_at': '2200-01-02' - } + self.sdk_connect_as_project_mock.assert_called_with(self.project) + filters = {'created_at': '2200-01-01', 'updated_at': '2200-01-02'} calls = [ mock.call(dry_run=True, status_queue=mock.ANY, filters=filters), - mock.call(dry_run=False, status_queue=mock.ANY, filters=filters) + mock.call(dry_run=False, status_queue=mock.ANY, filters=filters), ] self.project_cleanup_mock.assert_has_calls(calls) @@ -87,7 +93,8 @@ class TestProjectCleanup(TestProjectCleanupBase): def test_project_cleanup_with_auto_approve(self): arglist = [ - '--project', self.project.id, + '--project', + self.project.id, '--auto-approve', ] verifylist = [ @@ -101,11 +108,10 @@ class TestProjectCleanup(TestProjectCleanupBase): result = self.cmd.take_action(parsed_args) - self.sdk_connect_as_project_mock.assert_called_with( - self.project) + self.sdk_connect_as_project_mock.assert_called_with(self.project) calls = [ mock.call(dry_run=True, status_queue=mock.ANY, filters={}), - mock.call(dry_run=False, status_queue=mock.ANY, filters={}) + mock.call(dry_run=False, status_queue=mock.ANY, filters={}), ] self.project_cleanup_mock.assert_has_calls(calls) @@ -113,7 +119,8 @@ class TestProjectCleanup(TestProjectCleanupBase): def test_project_cleanup_with_project(self): arglist = [ - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -126,11 +133,10 @@ class TestProjectCleanup(TestProjectCleanupBase): with mock.patch('sys.stdin', StringIO('y')): result = self.cmd.take_action(parsed_args) - self.sdk_connect_as_project_mock.assert_called_with( - self.project) + self.sdk_connect_as_project_mock.assert_called_with(self.project) calls = [ mock.call(dry_run=True, status_queue=mock.ANY, filters={}), - mock.call(dry_run=False, status_queue=mock.ANY, filters={}) + mock.call(dry_run=False, status_queue=mock.ANY, filters={}), ] self.project_cleanup_mock.assert_has_calls(calls) @@ -138,7 +144,8 @@ class TestProjectCleanup(TestProjectCleanupBase): def test_project_cleanup_with_project_abort(self): arglist = [ - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -151,8 +158,7 @@ class TestProjectCleanup(TestProjectCleanupBase): with mock.patch('sys.stdin', StringIO('n')): result = self.cmd.take_action(parsed_args) - self.sdk_connect_as_project_mock.assert_called_with( - self.project) + self.sdk_connect_as_project_mock.assert_called_with(self.project) calls = [ mock.call(dry_run=True, status_queue=mock.ANY, filters={}), ] @@ -163,7 +169,8 @@ class TestProjectCleanup(TestProjectCleanupBase): def test_project_cleanup_with_dry_run(self): arglist = [ '--dry-run', - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', True), @@ -175,10 +182,10 @@ class TestProjectCleanup(TestProjectCleanupBase): result = self.cmd.take_action(parsed_args) - self.sdk_connect_as_project_mock.assert_called_with( - self.project) + self.sdk_connect_as_project_mock.assert_called_with(self.project) self.project_cleanup_mock.assert_called_once_with( - dry_run=True, status_queue=mock.ANY, filters={}) + dry_run=True, status_queue=mock.ANY, filters={} + ) self.assertIsNone(result) @@ -202,7 +209,7 @@ class TestProjectCleanup(TestProjectCleanupBase): self.sdk_connect_as_project_mock.assert_not_called() calls = [ mock.call(dry_run=True, status_queue=mock.ANY, filters={}), - mock.call(dry_run=False, status_queue=mock.ANY, filters={}) + mock.call(dry_run=False, status_queue=mock.ANY, filters={}), ] self.project_cleanup_mock.assert_has_calls(calls) diff --git a/openstackclient/tests/unit/common/test_project_purge.py b/openstackclient/tests/unit/common/test_project_purge.py index 26333d70..ae3f58ec 100644 --- a/openstackclient/tests/unit/common/test_project_purge.py +++ b/openstackclient/tests/unit/common/test_project_purge.py @@ -24,7 +24,6 @@ from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes class TestProjectPurgeInit(tests_utils.TestCommand): - def setUp(self): super().setUp() compute_client = compute_fakes.FakeComputev2Client( @@ -67,7 +66,6 @@ class TestProjectPurgeInit(tests_utils.TestCommand): class TestProjectPurge(TestProjectPurgeInit): - project = identity_fakes.FakeProject.create_one_project() server = compute_fakes.FakeServer.create_one_server() image = image_fakes.create_one_image() @@ -97,12 +95,18 @@ class TestProjectPurge(TestProjectPurgeInit): arglist = [] verifylist = [] - self.assertRaises(tests_utils.ParserException, self.check_parser, - self.cmd, arglist, verifylist) + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) def test_project_purge_with_project(self): arglist = [ - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -117,17 +121,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_called_once_with(self.project.id) self.projects_mock.delete.assert_called_once_with(self.project.id) self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_called_once_with(self.server.id) self.images_mock.delete.assert_called_once_with(self.image.id) self.volumes_mock.force_delete.assert_called_once_with(self.volume.id) @@ -138,7 +148,8 @@ class TestProjectPurge(TestProjectPurgeInit): def test_project_purge_with_dry_run(self): arglist = [ '--dry-run', - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', True), @@ -153,17 +164,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_called_once_with(self.project.id) self.projects_mock.delete.assert_not_called() self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_not_called() self.images_mock.delete.assert_not_called() self.volumes_mock.force_delete.assert_not_called() @@ -174,7 +191,8 @@ class TestProjectPurge(TestProjectPurgeInit): def test_project_purge_with_keep_project(self): arglist = [ '--keep-project', - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -189,17 +207,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_called_once_with(self.project.id) self.projects_mock.delete.assert_not_called() self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_called_once_with(self.server.id) self.images_mock.delete.assert_called_once_with(self.image.id) self.volumes_mock.force_delete.assert_called_once_with(self.volume.id) @@ -226,17 +250,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_not_called() self.projects_mock.delete.assert_called_once_with(self.project.id) self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_called_once_with(self.server.id) self.images_mock.delete.assert_called_once_with(self.image.id) self.volumes_mock.force_delete.assert_called_once_with(self.volume.id) @@ -248,7 +278,8 @@ class TestProjectPurge(TestProjectPurgeInit): def test_project_purge_with_exception(self, mock_error): self.servers_mock.delete.side_effect = exceptions.CommandError() arglist = [ - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -263,17 +294,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_called_once_with(self.project.id) self.projects_mock.delete.assert_called_once_with(self.project.id) self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_called_once_with(self.server.id) self.images_mock.delete.assert_called_once_with(self.image.id) self.volumes_mock.force_delete.assert_called_once_with(self.volume.id) @@ -285,7 +322,8 @@ class TestProjectPurge(TestProjectPurgeInit): def test_project_purge_with_force_delete_backup(self): self.backups_mock.delete.side_effect = [exceptions.CommandError, None] arglist = [ - '--project', self.project.id, + '--project', + self.project.id, ] verifylist = [ ('dry_run', False), @@ -300,17 +338,23 @@ class TestProjectPurge(TestProjectPurgeInit): self.projects_mock.get.assert_called_once_with(self.project.id) self.projects_mock.delete.assert_called_once_with(self.project.id) self.servers_mock.list.assert_called_once_with( - search_opts={'tenant_id': self.project.id, 'all_tenants': True}) + search_opts={'tenant_id': self.project.id, 'all_tenants': True} + ) kwargs = {'filters': {'owner': self.project.id}} self.images_mock.list.assert_called_once_with(**kwargs) - volume_search_opts = {'project_id': self.project.id, - 'all_tenants': True} + volume_search_opts = { + 'project_id': self.project.id, + 'all_tenants': True, + } self.volumes_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.snapshots_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.backups_mock.list.assert_called_once_with( - search_opts=volume_search_opts) + search_opts=volume_search_opts + ) self.servers_mock.delete.assert_called_once_with(self.server.id) self.images_mock.delete.assert_called_once_with(self.image.id) self.volumes_mock.force_delete.assert_called_once_with(self.volume.id) diff --git a/openstackclient/tests/unit/common/test_quota.py b/openstackclient/tests/unit/common/test_quota.py index 2470a96f..4487014c 100644 --- a/openstackclient/tests/unit/common/test_quota.py +++ b/openstackclient/tests/unit/common/test_quota.py @@ -25,7 +25,6 @@ from openstackclient.tests.unit.volume.v2 import fakes as volume_fakes class FakeQuotaResource(fakes.FakeResource): - _keys = {'property': 'value'} def set_keys(self, args): @@ -40,7 +39,6 @@ class FakeQuotaResource(fakes.FakeResource): class TestQuota(compute_fakes.TestComputev2): - def setUp(self): super(TestQuota, self).setUp() @@ -52,14 +50,16 @@ class TestQuota(compute_fakes.TestComputev2): self.compute_quotas_mock = self.app.client_manager.compute.quotas self.compute_quotas_mock.reset_mock() - self.compute_quotas_class_mock = \ + self.compute_quotas_class_mock = ( self.app.client_manager.compute.quota_classes + ) self.compute_quotas_class_mock.reset_mock() self.volume_quotas_mock = self.app.client_manager.volume.quotas self.volume_quotas_mock.reset_mock() - self.volume_quotas_class_mock = \ + self.volume_quotas_class_mock = ( self.app.client_manager.volume.quota_classes + ) self.volume_quotas_class_mock.reset_mock() self.app.client_manager.network = mock.Mock() @@ -67,8 +67,9 @@ class TestQuota(compute_fakes.TestComputev2): self.app.client_manager.auth_ref = mock.Mock() self.app.client_manager.auth_ref.service_catalog = mock.Mock() - self.service_catalog_mock = \ + self.service_catalog_mock = ( self.app.client_manager.auth_ref.service_catalog + ) self.service_catalog_mock.reset_mock() self.app.client_manager.auth_ref.project_id = identity_fakes.project_id @@ -101,7 +102,7 @@ class TestQuotaList(TestQuota): 'Security Groups', 'Security Group Rules', 'Subnets', - 'Subnet Pools' + 'Subnet Pools', ) volume_column_header = ( @@ -210,16 +211,14 @@ class TestQuotaList(TestQuota): in_use = values['used'] else: in_use = values['in_use'] - resource_values = [ - in_use, - values['reserved'], - values['limit']] + resource_values = [in_use, values['reserved'], values['limit']] reference_data.append(tuple([name] + resource_values)) return reference_data def test_quota_list_details_compute(self): detailed_quota = ( - compute_fakes.FakeQuota.create_one_comp_detailed_quota()) + compute_fakes.FakeQuota.create_one_comp_detailed_quota() + ) detailed_column_header = ( 'Resource', @@ -227,13 +226,15 @@ class TestQuotaList(TestQuota): 'Reserved', 'Limit', ) - detailed_reference_data = ( - self._get_detailed_reference_data(detailed_quota)) + detailed_reference_data = self._get_detailed_reference_data( + detailed_quota + ) self.compute.quotas.get = mock.Mock(return_value=detailed_quota) arglist = [ - '--detail', '--compute', + '--detail', + '--compute', ] verifylist = [ ('detail', True), @@ -245,12 +246,12 @@ class TestQuotaList(TestQuota): ret_quotas = list(data) self.assertEqual(detailed_column_header, columns) - self.assertEqual( - sorted(detailed_reference_data), sorted(ret_quotas)) + self.assertEqual(sorted(detailed_reference_data), sorted(ret_quotas)) def test_quota_list_details_network(self): detailed_quota = ( - network_fakes.FakeQuota.create_one_net_detailed_quota()) + network_fakes.FakeQuota.create_one_net_detailed_quota() + ) detailed_column_header = ( 'Resource', @@ -258,13 +259,15 @@ class TestQuotaList(TestQuota): 'Reserved', 'Limit', ) - detailed_reference_data = ( - self._get_detailed_reference_data(detailed_quota)) + detailed_reference_data = self._get_detailed_reference_data( + detailed_quota + ) self.network.get_quota = mock.Mock(return_value=detailed_quota) arglist = [ - '--detail', '--network', + '--detail', + '--network', ] verifylist = [ ('detail', True), @@ -276,8 +279,7 @@ class TestQuotaList(TestQuota): ret_quotas = list(data) self.assertEqual(detailed_column_header, columns) - self.assertEqual( - sorted(detailed_reference_data), sorted(ret_quotas)) + self.assertEqual(sorted(detailed_reference_data), sorted(ret_quotas)) def test_quota_list_details_volume(self): detailed_quota = volume_fakes.create_one_detailed_quota() @@ -288,8 +290,9 @@ class TestQuotaList(TestQuota): 'Reserved', 'Limit', ) - detailed_reference_data = ( - self._get_detailed_reference_data(detailed_quota)) + detailed_reference_data = self._get_detailed_reference_data( + detailed_quota + ) self.volume.quotas.get = mock.Mock(return_value=detailed_quota) @@ -433,7 +436,8 @@ class TestQuotaList(TestQuota): arglist = [ '--compute', - '--project', self.projects[0].name, + '--project', + self.projects[0].name, ] verifylist = [ ('compute', True), @@ -525,7 +529,8 @@ class TestQuotaList(TestQuota): arglist = [ '--network', - '--project', self.projects[0].name, + '--project', + self.projects[0].name, ] verifylist = [ ('network', True), @@ -617,7 +622,8 @@ class TestQuotaList(TestQuota): arglist = [ '--volume', - '--project', self.projects[0].name, + '--project', + self.projects[0].name, ] verifylist = [ ('volume', True), @@ -634,7 +640,6 @@ class TestQuotaList(TestQuota): class TestQuotaSet(TestQuota): - def setUp(self): super(TestQuotaSet, self).setUp() @@ -666,28 +671,44 @@ class TestQuotaSet(TestQuota): def test_quota_set(self): arglist = [ - '--floating-ips', str(compute_fakes.floating_ip_num), - '--fixed-ips', str(compute_fakes.fix_ip_num), - '--injected-files', str(compute_fakes.injected_file_num), - '--injected-file-size', str(compute_fakes.injected_file_size_num), - '--injected-path-size', str(compute_fakes.injected_path_size_num), - '--key-pairs', str(compute_fakes.key_pair_num), - '--cores', str(compute_fakes.core_num), - '--ram', str(compute_fakes.ram_num), - '--instances', str(compute_fakes.instance_num), - '--properties', str(compute_fakes.property_num), - '--secgroup-rules', str(compute_fakes.secgroup_rule_num), - '--secgroups', str(compute_fakes.secgroup_num), - '--server-groups', str(compute_fakes.servgroup_num), - '--server-group-members', str(compute_fakes.servgroup_members_num), + '--floating-ips', + str(compute_fakes.floating_ip_num), + '--fixed-ips', + str(compute_fakes.fix_ip_num), + '--injected-files', + str(compute_fakes.injected_file_num), + '--injected-file-size', + str(compute_fakes.injected_file_size_num), + '--injected-path-size', + str(compute_fakes.injected_path_size_num), + '--key-pairs', + str(compute_fakes.key_pair_num), + '--cores', + str(compute_fakes.core_num), + '--ram', + str(compute_fakes.ram_num), + '--instances', + str(compute_fakes.instance_num), + '--properties', + str(compute_fakes.property_num), + '--secgroup-rules', + str(compute_fakes.secgroup_rule_num), + '--secgroups', + str(compute_fakes.secgroup_num), + '--server-groups', + str(compute_fakes.servgroup_num), + '--server-group-members', + str(compute_fakes.servgroup_members_num), self.projects[0].name, ] verifylist = [ ('floating_ips', compute_fakes.floating_ip_num), ('fixed_ips', compute_fakes.fix_ip_num), ('injected_files', compute_fakes.injected_file_num), - ('injected_file_content_bytes', - compute_fakes.injected_file_size_num), + ( + 'injected_file_content_bytes', + compute_fakes.injected_file_size_num, + ), ('injected_file_path_bytes', compute_fakes.injected_path_size_num), ('key_pairs', compute_fakes.key_pair_num), ('cores', compute_fakes.core_num), @@ -709,8 +730,7 @@ class TestQuotaSet(TestQuota): 'floating_ips': compute_fakes.floating_ip_num, 'fixed_ips': compute_fakes.fix_ip_num, 'injected_files': compute_fakes.injected_file_num, - 'injected_file_content_bytes': - compute_fakes.injected_file_size_num, + 'injected_file_content_bytes': compute_fakes.injected_file_size_num, # noqa: E501 'injected_file_path_bytes': compute_fakes.injected_path_size_num, 'key_pairs': compute_fakes.key_pair_num, 'cores': compute_fakes.core_num, @@ -724,18 +744,22 @@ class TestQuotaSet(TestQuota): } self.compute_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs + self.projects[0].id, **kwargs ) self.assertIsNone(result) def test_quota_set_volume(self): arglist = [ - '--gigabytes', str(volume_fakes.QUOTA['gigabytes']), - '--snapshots', str(volume_fakes.QUOTA['snapshots']), - '--volumes', str(volume_fakes.QUOTA['volumes']), - '--backups', str(volume_fakes.QUOTA['backups']), - '--backup-gigabytes', str(volume_fakes.QUOTA['backup_gigabytes']), + '--gigabytes', + str(volume_fakes.QUOTA['gigabytes']), + '--snapshots', + str(volume_fakes.QUOTA['snapshots']), + '--volumes', + str(volume_fakes.QUOTA['volumes']), + '--backups', + str(volume_fakes.QUOTA['backups']), + '--backup-gigabytes', + str(volume_fakes.QUOTA['backup_gigabytes']), '--per-volume-gigabytes', str(volume_fakes.QUOTA['per_volume_gigabytes']), self.projects[0].name, @@ -746,8 +770,10 @@ class TestQuotaSet(TestQuota): ('volumes', volume_fakes.QUOTA['volumes']), ('backups', volume_fakes.QUOTA['backups']), ('backup_gigabytes', volume_fakes.QUOTA['backup_gigabytes']), - ('per_volume_gigabytes', - volume_fakes.QUOTA['per_volume_gigabytes']), + ( + 'per_volume_gigabytes', + volume_fakes.QUOTA['per_volume_gigabytes'], + ), ('project', self.projects[0].name), ] parsed_args = self.check_parser(self.cmd, arglist, verifylist) @@ -760,26 +786,31 @@ class TestQuotaSet(TestQuota): 'volumes': volume_fakes.QUOTA['volumes'], 'backups': volume_fakes.QUOTA['backups'], 'backup_gigabytes': volume_fakes.QUOTA['backup_gigabytes'], - 'per_volume_gigabytes': volume_fakes.QUOTA['per_volume_gigabytes'] + 'per_volume_gigabytes': volume_fakes.QUOTA['per_volume_gigabytes'], } self.volume_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs + self.projects[0].id, **kwargs ) self.assertIsNone(result) def test_quota_set_volume_with_volume_type(self): arglist = [ - '--gigabytes', str(volume_fakes.QUOTA['gigabytes']), - '--snapshots', str(volume_fakes.QUOTA['snapshots']), - '--volumes', str(volume_fakes.QUOTA['volumes']), - '--backups', str(volume_fakes.QUOTA['backups']), - '--backup-gigabytes', str(volume_fakes.QUOTA['backup_gigabytes']), + '--gigabytes', + str(volume_fakes.QUOTA['gigabytes']), + '--snapshots', + str(volume_fakes.QUOTA['snapshots']), + '--volumes', + str(volume_fakes.QUOTA['volumes']), + '--backups', + str(volume_fakes.QUOTA['backups']), + '--backup-gigabytes', + str(volume_fakes.QUOTA['backup_gigabytes']), '--per-volume-gigabytes', str(volume_fakes.QUOTA['per_volume_gigabytes']), - '--volume-type', 'volume_type_backend', + '--volume-type', + 'volume_type_backend', self.projects[0].name, ] verifylist = [ @@ -788,8 +819,10 @@ class TestQuotaSet(TestQuota): ('volumes', volume_fakes.QUOTA['volumes']), ('backups', volume_fakes.QUOTA['backups']), ('backup_gigabytes', volume_fakes.QUOTA['backup_gigabytes']), - ('per_volume_gigabytes', - volume_fakes.QUOTA['per_volume_gigabytes']), + ( + 'per_volume_gigabytes', + volume_fakes.QUOTA['per_volume_gigabytes'], + ), ('volume_type', 'volume_type_backend'), ('project', self.projects[0].name), ] @@ -803,27 +836,34 @@ class TestQuotaSet(TestQuota): 'volumes_volume_type_backend': volume_fakes.QUOTA['volumes'], 'backups': volume_fakes.QUOTA['backups'], 'backup_gigabytes': volume_fakes.QUOTA['backup_gigabytes'], - 'per_volume_gigabytes': volume_fakes.QUOTA['per_volume_gigabytes'] + 'per_volume_gigabytes': volume_fakes.QUOTA['per_volume_gigabytes'], } self.volume_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs + self.projects[0].id, **kwargs ) self.assertIsNone(result) def test_quota_set_network(self): arglist = [ - '--subnets', str(network_fakes.QUOTA['subnet']), - '--networks', str(network_fakes.QUOTA['network']), - '--floating-ips', str(network_fakes.QUOTA['floatingip']), - '--subnetpools', str(network_fakes.QUOTA['subnetpool']), + '--subnets', + str(network_fakes.QUOTA['subnet']), + '--networks', + str(network_fakes.QUOTA['network']), + '--floating-ips', + str(network_fakes.QUOTA['floatingip']), + '--subnetpools', + str(network_fakes.QUOTA['subnetpool']), '--secgroup-rules', str(network_fakes.QUOTA['security_group_rule']), - '--secgroups', str(network_fakes.QUOTA['security_group']), - '--routers', str(network_fakes.QUOTA['router']), - '--rbac-policies', str(network_fakes.QUOTA['rbac_policy']), - '--ports', str(network_fakes.QUOTA['port']), + '--secgroups', + str(network_fakes.QUOTA['security_group']), + '--routers', + str(network_fakes.QUOTA['router']), + '--rbac-policies', + str(network_fakes.QUOTA['rbac_policy']), + '--ports', + str(network_fakes.QUOTA['port']), self.projects[0].name, ] verifylist = [ @@ -831,8 +871,10 @@ class TestQuotaSet(TestQuota): ('network', network_fakes.QUOTA['network']), ('floatingip', network_fakes.QUOTA['floatingip']), ('subnetpool', network_fakes.QUOTA['subnetpool']), - ('security_group_rule', - network_fakes.QUOTA['security_group_rule']), + ( + 'security_group_rule', + network_fakes.QUOTA['security_group_rule'], + ), ('security_group', network_fakes.QUOTA['security_group']), ('router', network_fakes.QUOTA['router']), ('rbac_policy', network_fakes.QUOTA['rbac_policy']), @@ -847,42 +889,56 @@ class TestQuotaSet(TestQuota): 'network': network_fakes.QUOTA['network'], 'floatingip': network_fakes.QUOTA['floatingip'], 'subnetpool': network_fakes.QUOTA['subnetpool'], - 'security_group_rule': - network_fakes.QUOTA['security_group_rule'], + 'security_group_rule': network_fakes.QUOTA['security_group_rule'], 'security_group': network_fakes.QUOTA['security_group'], 'router': network_fakes.QUOTA['router'], 'rbac_policy': network_fakes.QUOTA['rbac_policy'], 'port': network_fakes.QUOTA['port'], } self.network_mock.update_quota.assert_called_once_with( - self.projects[0].id, - **kwargs + self.projects[0].id, **kwargs ) self.assertIsNone(result) def test_quota_set_with_class(self): arglist = [ - '--injected-files', str(compute_fakes.injected_file_num), - '--injected-file-size', str(compute_fakes.injected_file_size_num), - '--injected-path-size', str(compute_fakes.injected_path_size_num), - '--key-pairs', str(compute_fakes.key_pair_num), - '--cores', str(compute_fakes.core_num), - '--ram', str(compute_fakes.ram_num), - '--instances', str(compute_fakes.instance_num), - '--properties', str(compute_fakes.property_num), - '--server-groups', str(compute_fakes.servgroup_num), - '--server-group-members', str(compute_fakes.servgroup_members_num), - '--gigabytes', str(compute_fakes.floating_ip_num), - '--snapshots', str(compute_fakes.fix_ip_num), - '--volumes', str(volume_fakes.QUOTA['volumes']), - '--network', str(network_fakes.QUOTA['network']), + '--injected-files', + str(compute_fakes.injected_file_num), + '--injected-file-size', + str(compute_fakes.injected_file_size_num), + '--injected-path-size', + str(compute_fakes.injected_path_size_num), + '--key-pairs', + str(compute_fakes.key_pair_num), + '--cores', + str(compute_fakes.core_num), + '--ram', + str(compute_fakes.ram_num), + '--instances', + str(compute_fakes.instance_num), + '--properties', + str(compute_fakes.property_num), + '--server-groups', + str(compute_fakes.servgroup_num), + '--server-group-members', + str(compute_fakes.servgroup_members_num), + '--gigabytes', + str(compute_fakes.floating_ip_num), + '--snapshots', + str(compute_fakes.fix_ip_num), + '--volumes', + str(volume_fakes.QUOTA['volumes']), + '--network', + str(network_fakes.QUOTA['network']), '--class', self.projects[0].name, ] verifylist = [ ('injected_files', compute_fakes.injected_file_num), - ('injected_file_content_bytes', - compute_fakes.injected_file_size_num), + ( + 'injected_file_content_bytes', + compute_fakes.injected_file_size_num, + ), ('injected_file_path_bytes', compute_fakes.injected_path_size_num), ('key_pairs', compute_fakes.key_pair_num), ('cores', compute_fakes.core_num), @@ -904,8 +960,7 @@ class TestQuotaSet(TestQuota): kwargs_compute = { 'injected_files': compute_fakes.injected_file_num, - 'injected_file_content_bytes': - compute_fakes.injected_file_size_num, + 'injected_file_content_bytes': compute_fakes.injected_file_size_num, # noqa: E501 'injected_file_path_bytes': compute_fakes.injected_path_size_num, 'key_pairs': compute_fakes.key_pair_num, 'cores': compute_fakes.core_num, @@ -922,23 +977,26 @@ class TestQuotaSet(TestQuota): } self.compute_quotas_class_mock.update.assert_called_with( - self.projects[0].name, - **kwargs_compute + self.projects[0].name, **kwargs_compute ) self.volume_quotas_class_mock.update.assert_called_with( - self.projects[0].name, - **kwargs_volume + self.projects[0].name, **kwargs_volume ) self.assertNotCalled(self.network_mock.update_quota) self.assertIsNone(result) def test_quota_set_with_force(self): arglist = [ - '--cores', str(compute_fakes.core_num), - '--ram', str(compute_fakes.ram_num), - '--instances', str(compute_fakes.instance_num), - '--volumes', str(volume_fakes.QUOTA['volumes']), - '--subnets', str(network_fakes.QUOTA['subnet']), + '--cores', + str(compute_fakes.core_num), + '--ram', + str(compute_fakes.ram_num), + '--instances', + str(compute_fakes.instance_num), + '--volumes', + str(volume_fakes.QUOTA['volumes']), + '--subnets', + str(network_fakes.QUOTA['subnet']), '--force', self.projects[0].name, ] @@ -970,24 +1028,24 @@ class TestQuotaSet(TestQuota): 'force': True, } self.compute_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs_compute + self.projects[0].id, **kwargs_compute ) self.volume_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs_volume + self.projects[0].id, **kwargs_volume ) self.network_mock.update_quota.assert_called_once_with( - self.projects[0].id, - **kwargs_network + self.projects[0].id, **kwargs_network ) self.assertIsNone(result) def test_quota_set_with_no_force(self): arglist = [ - '--subnets', str(network_fakes.QUOTA['subnet']), - '--volumes', str(volume_fakes.QUOTA['volumes']), - '--cores', str(compute_fakes.core_num), + '--subnets', + str(network_fakes.QUOTA['subnet']), + '--volumes', + str(volume_fakes.QUOTA['volumes']), + '--cores', + str(compute_fakes.core_num), '--no-force', self.projects[0].name, ] @@ -1014,31 +1072,29 @@ class TestQuotaSet(TestQuota): 'check_limit': True, } self.compute_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs_compute + self.projects[0].id, **kwargs_compute ) self.volume_quotas_mock.update.assert_called_once_with( - self.projects[0].id, - **kwargs_volume + self.projects[0].id, **kwargs_volume ) self.network_mock.update_quota.assert_called_once_with( - self.projects[0].id, - **kwargs_network + self.projects[0].id, **kwargs_network ) self.assertIsNone(result) class TestQuotaShow(TestQuota): - def setUp(self): super().setUp() self.compute_quota = compute_fakes.FakeQuota.create_one_comp_quota() self.compute_quotas_mock.get.return_value = self.compute_quota - self.compute_default_quota = \ + self.compute_default_quota = ( compute_fakes.FakeQuota.create_one_default_comp_quota() - self.compute_quotas_mock.defaults.return_value = \ + ) + self.compute_quotas_mock.defaults.return_value = ( self.compute_default_quota + ) self.compute_quotas_class_mock.get.return_value = FakeQuotaResource( None, copy.deepcopy(compute_fakes.QUOTA), @@ -1048,8 +1104,9 @@ class TestQuotaShow(TestQuota): self.volume_quota = volume_fakes.create_one_vol_quota() self.volume_quotas_mock.get.return_value = self.volume_quota self.volume_default_quota = volume_fakes.create_one_default_vol_quota() - self.volume_quotas_mock.defaults.return_value = \ + self.volume_quotas_mock.defaults.return_value = ( self.volume_default_quota + ) self.volume_quotas_class_mock.get.return_value = FakeQuotaResource( None, copy.deepcopy(volume_fakes.QUOTA), @@ -1212,13 +1269,15 @@ class TestQuotaShow(TestQuota): def test_quota_show__with_usage(self): # update mocks to return detailed quota instead - self.compute_quota = \ + self.compute_quota = ( compute_fakes.FakeQuota.create_one_comp_detailed_quota() + ) self.compute_quotas_mock.get.return_value = self.compute_quota self.volume_quota = volume_fakes.create_one_detailed_quota() self.volume_quotas_mock.get.return_value = self.volume_quota - self.network.get_quota.return_value = \ + self.network.get_quota.return_value = ( network_fakes.FakeQuota.create_one_net_detailed_quota() + ) arglist = [ '--usage', |