From f49f0fead2933ace4cb85c70bd14d13d0c479e6a Mon Sep 17 00:00:00 2001
From: Brandon Palm <bapalm@us.ibm.com>
Date: Tue, 23 Feb 2016 10:38:58 -0600
Subject: [PATCH] Fixed a bunch of spacing
Nothing too complicated here. I fixed a bunch of spacing issues
that I saw in OSC.
Change-Id: I935ab48e7c5bac5f88ecdb3a05f73fb44fc9f41d
---
openstackclient/common/clientmanager.py | 1 +
openstackclient/common/command.py | 1 +
openstackclient/common/exceptions.py | 1 +
openstackclient/common/quota.py | 4 +-
openstackclient/compute/v2/flavor.py | 6 +-
openstackclient/identity/client.py | 3 +-
.../identity/v3/role_assignment.py | 2 +-
openstackclient/identity/v3/unscoped_saml.py | 1 +
openstackclient/image/v1/image.py | 8 +-
openstackclient/network/v2/port.py | 4 +-
.../tests/common/test_clientmanager.py | 2 +
openstackclient/tests/common/test_command.py | 1 +
.../tests/common/test_commandmanager.py | 2 +
openstackclient/tests/common/test_logs.py | 2 +
openstackclient/tests/common/test_timing.py | 2 +-
openstackclient/tests/common/test_utils.py | 1 +
openstackclient/tests/compute/v2/fakes.py | 2 +
openstackclient/tests/fakes.py | 9 ++
openstackclient/tests/identity/v2_0/fakes.py | 2 +
openstackclient/tests/identity/v3/fakes.py | 9 ++
.../tests/identity/v3/test_credential.py | 1 +
.../identity/v3/test_identity_provider.py | 5 +
.../tests/identity/v3/test_mappings.py | 104 +++++++++---------
.../tests/identity/v3/test_role_assignment.py | 2 +-
.../identity/v3/test_service_provider.py | 2 +
openstackclient/tests/image/v1/fakes.py | 2 +
openstackclient/tests/image/v2/fakes.py | 2 +
openstackclient/tests/image/v2/test_image.py | 2 +-
openstackclient/tests/network/test_common.py | 7 ++
openstackclient/tests/network/v2/fakes.py | 2 +
.../tests/network/v2/test_subnet.py | 1 +
.../tests/network/v2/test_subnet_pool.py | 1 +
openstackclient/tests/object/v1/fakes.py | 1 +
.../tests/object/v1/test_container.py | 1 +
.../tests/object/v1/test_object.py | 1 +
.../tests/object/v1/test_object_all.py | 1 +
openstackclient/tests/test_shell.py | 7 ++
openstackclient/tests/utils.py | 1 +
openstackclient/tests/volume/v1/fakes.py | 3 +
.../tests/volume/v1/test_qos_specs.py | 7 ++
openstackclient/tests/volume/v2/fakes.py | 2 +
.../tests/volume/v2/test_backup.py | 4 +
.../tests/volume/v2/test_qos_specs.py | 7 ++
.../tests/volume/v2/test_snapshot.py | 7 +-
openstackclient/tests/volume/v2/test_type.py | 6 +-
.../tests/volume/v2/test_volume.py | 3 +
openstackclient/volume/v2/volume.py | 2 +-
47 files changed, 177 insertions(+), 70 deletions(-)
diff --git a/openstackclient/common/clientmanager.py b/openstackclient/common/clientmanager.py
index fd88bdecb9..938dd05cee 100644
--- a/openstackclient/common/clientmanager.py
+++ b/openstackclient/common/clientmanager.py
@@ -37,6 +37,7 @@ USER_AGENT = 'python-openstackclient'
class ClientCache(object):
"""Descriptor class for caching created client handles."""
+
def __init__(self, factory):
self.factory = factory
self._handle = None
diff --git a/openstackclient/common/command.py b/openstackclient/common/command.py
index 13b0bcc2c4..fee4559e75 100644
--- a/openstackclient/common/command.py
+++ b/openstackclient/common/command.py
@@ -22,6 +22,7 @@ import six
class CommandMeta(abc.ABCMeta):
+
def __new__(mcs, name, bases, cls_dict):
if 'log' not in cls_dict:
cls_dict['log'] = logging.getLogger(
diff --git a/openstackclient/common/exceptions.py b/openstackclient/common/exceptions.py
index 8ec4993195..5f5f5ab1a6 100644
--- a/openstackclient/common/exceptions.py
+++ b/openstackclient/common/exceptions.py
@@ -41,6 +41,7 @@ class UnsupportedVersion(Exception):
class ClientException(Exception):
"""The base exception class for all exceptions this library raises."""
+
def __init__(self, code, message=None, details=None):
self.code = code
self.message = message or self.__class__.message
diff --git a/openstackclient/common/quota.py b/openstackclient/common/quota.py
index f208948e8f..b3d4c3b618 100644
--- a/openstackclient/common/quota.py
+++ b/openstackclient/common/quota.py
@@ -169,7 +169,7 @@ class ShowQuota(command.ShowOne):
project = utils.find_resource(
identity_client.projects,
parsed_args.project,
- ).id
+ ).id
try:
if parsed_args.quota_class:
@@ -193,7 +193,7 @@ class ShowQuota(command.ShowOne):
project = utils.find_resource(
identity_client.projects,
parsed_args.project,
- ).id
+ ).id
return self.app.client_manager.network.get_quota(project)
else:
return {}
diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index 093592cd82..0308d9409b 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -149,20 +149,20 @@ class ListFlavor(command.Lister):
action="store_true",
default=True,
help="List only public flavors (default)",
- )
+ )
public_group.add_argument(
"--private",
dest="public",
action="store_false",
help="List only private flavors",
- )
+ )
public_group.add_argument(
"--all",
dest="all",
action="store_true",
default=False,
help="List all flavors, whether public or private",
- )
+ )
parser.add_argument(
'--long',
action='store_true',
diff --git a/openstackclient/identity/client.py b/openstackclient/identity/client.py
index bd882ce80b..c166e66a81 100644
--- a/openstackclient/identity/client.py
+++ b/openstackclient/identity/client.py
@@ -53,7 +53,7 @@ def make_client(instance):
session=instance.session,
region_name=instance._region_name,
**kwargs
- )
+ )
return client
@@ -72,6 +72,7 @@ def build_option_parser(parser):
class IdentityClientv2(identity_client_v2.Client):
"""Tweak the earlier client class to deal with some changes"""
+
def __getattr__(self, name):
# Map v3 'projects' back to v2 'tenants'
if name == "projects":
diff --git a/openstackclient/identity/v3/role_assignment.py b/openstackclient/identity/v3/role_assignment.py
index e2b0fe1f06..a1418a8221 100644
--- a/openstackclient/identity/v3/role_assignment.py
+++ b/openstackclient/identity/v3/role_assignment.py
@@ -134,7 +134,7 @@ class ListRoleAssignment(command.Lister):
if 'project' in scope:
if include_names:
prj = '@'.join([scope['project']['name'],
- scope['project']['domain']['name']])
+ scope['project']['domain']['name']])
setattr(assignment, 'project', prj)
else:
setattr(assignment, 'project', scope['project']['id'])
diff --git a/openstackclient/identity/v3/unscoped_saml.py b/openstackclient/identity/v3/unscoped_saml.py
index a42637ddc3..8e2616a691 100644
--- a/openstackclient/identity/v3/unscoped_saml.py
+++ b/openstackclient/identity/v3/unscoped_saml.py
@@ -27,6 +27,7 @@ UNSCOPED_AUTH_PLUGINS = ['v3unscopedsaml', 'v3unscopedadfs', 'v3oidc']
def auth_with_unscoped_saml(func):
"""Check the unscoped federated context"""
+
def _decorated(self, parsed_args):
auth_plugin_name = self.app.client_manager.auth_plugin_name
if auth_plugin_name in UNSCOPED_AUTH_PLUGINS:
diff --git a/openstackclient/image/v1/image.py b/openstackclient/image/v1/image.py
index 9cc5facd43..6e172bce21 100644
--- a/openstackclient/image/v1/image.py
+++ b/openstackclient/image/v1/image.py
@@ -265,8 +265,8 @@ class CreateImage(command.ShowOne):
finally:
# Clean up open files - make sure data isn't a string
if ('data' in kwargs and hasattr(kwargs['data'], 'close') and
- kwargs['data'] != sys.stdin):
- kwargs['data'].close()
+ kwargs['data'] != sys.stdin):
+ kwargs['data'].close()
info.update(image._info)
info['properties'] = utils.format_dict(info.get('properties', {}))
@@ -697,8 +697,8 @@ class SetImage(command.Command):
finally:
# Clean up open files - make sure data isn't a string
if ('data' in kwargs and hasattr(kwargs['data'], 'close') and
- kwargs['data'] != sys.stdin):
- kwargs['data'].close()
+ kwargs['data'] != sys.stdin):
+ kwargs['data'].close()
class ShowImage(command.ShowOne):
diff --git a/openstackclient/network/v2/port.py b/openstackclient/network/v2/port.py
index 46cb031f91..19b3701d87 100644
--- a/openstackclient/network/v2/port.py
+++ b/openstackclient/network/v2/port.py
@@ -26,9 +26,9 @@ _formatters = {
'allowed_address_pairs': utils.format_list_of_dicts,
'binding_profile': utils.format_dict,
'binding_vif_details': utils.format_dict,
- 'dns_assignment': utils.format_list_of_dicts,
+ 'dns_assignment': utils.format_list_of_dicts,
'extra_dhcp_opts': utils.format_list_of_dicts,
- 'fixed_ips': utils.format_list_of_dicts,
+ 'fixed_ips': utils.format_list_of_dicts,
'security_groups': utils.format_list,
}
diff --git a/openstackclient/tests/common/test_clientmanager.py b/openstackclient/tests/common/test_clientmanager.py
index ef46f61c56..2bd9e7836b 100644
--- a/openstackclient/tests/common/test_clientmanager.py
+++ b/openstackclient/tests/common/test_clientmanager.py
@@ -47,6 +47,7 @@ class Container(object):
class FakeOptions(object):
+
def __init__(self, **kwargs):
for option in auth.OPTIONS_LIST:
setattr(self, option.replace('-', '_'), None)
@@ -71,6 +72,7 @@ class TestClientCache(utils.TestCase):
class TestClientManager(utils.TestCase):
+
def setUp(self):
super(TestClientManager, self).setUp()
self.mock = mock.Mock()
diff --git a/openstackclient/tests/common/test_command.py b/openstackclient/tests/common/test_command.py
index 1b2584bdde..7467d9eba4 100644
--- a/openstackclient/tests/common/test_command.py
+++ b/openstackclient/tests/common/test_command.py
@@ -19,6 +19,7 @@ from openstackclient.tests import utils as test_utils
class FakeCommand(command.Command):
+
def take_action(self, parsed_args):
pass
diff --git a/openstackclient/tests/common/test_commandmanager.py b/openstackclient/tests/common/test_commandmanager.py
index 37dc90feb6..e2b274dcb0 100644
--- a/openstackclient/tests/common/test_commandmanager.py
+++ b/openstackclient/tests/common/test_commandmanager.py
@@ -20,6 +20,7 @@ from openstackclient.tests import utils
class FakeCommand(object):
+
@classmethod
def load(cls):
return cls
@@ -48,6 +49,7 @@ class FakeCommandManager(commandmanager.CommandManager):
class TestCommandManager(utils.TestCase):
+
def test_add_command_group(self):
mgr = FakeCommandManager('test')
diff --git a/openstackclient/tests/common/test_logs.py b/openstackclient/tests/common/test_logs.py
index a319533ace..0386cdfda0 100644
--- a/openstackclient/tests/common/test_logs.py
+++ b/openstackclient/tests/common/test_logs.py
@@ -66,6 +66,7 @@ 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 '
@@ -93,6 +94,7 @@ class TestFileFormatter(utils.TestCase):
class TestLogConfigurator(utils.TestCase):
+
def setUp(self):
super(TestLogConfigurator, self).setUp()
self.options = mock.Mock()
diff --git a/openstackclient/tests/common/test_timing.py b/openstackclient/tests/common/test_timing.py
index c4c738b259..e33bb7ae27 100644
--- a/openstackclient/tests/common/test_timing.py
+++ b/openstackclient/tests/common/test_timing.py
@@ -75,7 +75,7 @@ class TestTiming(utils.TestCommand):
def test_timing_list(self):
self.app.timing_data = [(
timing_url,
- datetime.timedelta(microseconds=timing_elapsed*1000000),
+ datetime.timedelta(microseconds=timing_elapsed * 1000000),
)]
arglist = []
diff --git a/openstackclient/tests/common/test_utils.py b/openstackclient/tests/common/test_utils.py
index da7ce06379..95bce45871 100644
--- a/openstackclient/tests/common/test_utils.py
+++ b/openstackclient/tests/common/test_utils.py
@@ -250,6 +250,7 @@ class NoUniqueMatch(Exception):
class TestFindResource(test_utils.TestCase):
+
def setUp(self):
super(TestFindResource, self).setUp()
self.name = 'legos'
diff --git a/openstackclient/tests/compute/v2/fakes.py b/openstackclient/tests/compute/v2/fakes.py
index d2341ccc43..b106919409 100644
--- a/openstackclient/tests/compute/v2/fakes.py
+++ b/openstackclient/tests/compute/v2/fakes.py
@@ -87,6 +87,7 @@ SERVICE = {
class FakeComputev2Client(object):
+
def __init__(self, **kwargs):
self.aggregates = mock.Mock()
self.aggregates.resource_class = fakes.FakeResource(None, {})
@@ -142,6 +143,7 @@ class FakeComputev2Client(object):
class TestComputev2(utils.TestCommand):
+
def setUp(self):
super(TestComputev2, self).setUp()
diff --git a/openstackclient/tests/fakes.py b/openstackclient/tests/fakes.py
index 718dff694b..9fdcc7e923 100644
--- a/openstackclient/tests/fakes.py
+++ b/openstackclient/tests/fakes.py
@@ -51,6 +51,7 @@ TEST_VERSIONS = fixture.DiscoveryList(href=AUTH_URL)
class FakeStdout(object):
+
def __init__(self):
self.content = []
@@ -65,6 +66,7 @@ class FakeStdout(object):
class FakeLog(object):
+
def __init__(self):
self.messages = {}
@@ -85,6 +87,7 @@ class FakeLog(object):
class FakeApp(object):
+
def __init__(self, _stdout, _log):
self.stdout = _stdout
self.client_manager = None
@@ -95,12 +98,14 @@ class FakeApp(object):
class FakeClient(object):
+
def __init__(self, **kwargs):
self.endpoint = kwargs['endpoint']
self.token = kwargs['token']
class FakeClientManager(object):
+
def __init__(self):
self.compute = None
self.identity = None
@@ -129,12 +134,14 @@ class FakeClientManager(object):
class FakeModule(object):
+
def __init__(self, name, version):
self.name = name
self.__version__ = version
class FakeResource(object):
+
def __init__(self, manager=None, info={}, loaded=False, methods={}):
"""Set attributes and methods for a resource.
@@ -178,6 +185,7 @@ class FakeResource(object):
class FakeResponse(requests.Response):
+
def __init__(self, headers={}, status_code=200, data=None, encoding=None):
super(FakeResponse, self).__init__()
@@ -190,6 +198,7 @@ class FakeResponse(requests.Response):
class FakeModel(dict):
+
def __getattr__(self, key):
try:
return self[key]
diff --git a/openstackclient/tests/identity/v2_0/fakes.py b/openstackclient/tests/identity/v2_0/fakes.py
index 565606c161..b37bd9da2f 100644
--- a/openstackclient/tests/identity/v2_0/fakes.py
+++ b/openstackclient/tests/identity/v2_0/fakes.py
@@ -128,6 +128,7 @@ EXTENSION = {
class FakeIdentityv2Client(object):
+
def __init__(self, **kwargs):
self.roles = mock.Mock()
self.roles.resource_class = fakes.FakeResource(None, {})
@@ -157,6 +158,7 @@ class FakeIdentityv2Client(object):
class TestIdentityv2(utils.TestCommand):
+
def setUp(self):
super(TestIdentityv2, self).setUp()
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 420604f180..1422166a90 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -420,6 +420,7 @@ OAUTH_VERIFIER = {
class FakeAuth(object):
+
def __init__(self, auth_method_class=None):
self._auth_method_class = auth_method_class
@@ -428,11 +429,13 @@ class FakeAuth(object):
class FakeSession(object):
+
def __init__(self, **kwargs):
self.auth = FakeAuth()
class FakeIdentityv3Client(object):
+
def __init__(self, **kwargs):
self.domains = mock.Mock()
self.domains.resource_class = fakes.FakeResource(None, {})
@@ -468,6 +471,7 @@ class FakeIdentityv3Client(object):
class FakeFederationManager(object):
+
def __init__(self, **kwargs):
self.identity_providers = mock.Mock()
self.identity_providers.resource_class = fakes.FakeResource(None, {})
@@ -484,12 +488,14 @@ class FakeFederationManager(object):
class FakeFederatedClient(FakeIdentityv3Client):
+
def __init__(self, **kwargs):
super(FakeFederatedClient, self).__init__(**kwargs)
self.federation = FakeFederationManager()
class FakeOAuth1Client(FakeIdentityv3Client):
+
def __init__(self, **kwargs):
super(FakeOAuth1Client, self).__init__(**kwargs)
@@ -502,6 +508,7 @@ class FakeOAuth1Client(FakeIdentityv3Client):
class TestIdentityv3(utils.TestCommand):
+
def setUp(self):
super(TestIdentityv3, self).setUp()
@@ -512,6 +519,7 @@ class TestIdentityv3(utils.TestCommand):
class TestFederatedIdentity(utils.TestCommand):
+
def setUp(self):
super(TestFederatedIdentity, self).setUp()
@@ -522,6 +530,7 @@ class TestFederatedIdentity(utils.TestCommand):
class TestOAuth1(utils.TestCommand):
+
def setUp(self):
super(TestOAuth1, self).setUp()
diff --git a/openstackclient/tests/identity/v3/test_credential.py b/openstackclient/tests/identity/v3/test_credential.py
index e2e690c3b4..afff7b6c09 100644
--- a/openstackclient/tests/identity/v3/test_credential.py
+++ b/openstackclient/tests/identity/v3/test_credential.py
@@ -46,6 +46,7 @@ class TestCredential(identity_fakes.TestIdentityv3):
class TestCredentialSet(TestCredential):
+
def setUp(self):
super(TestCredentialSet, self).setUp()
self.cmd = credential.SetCredential(self.app, None)
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index 7591151091..ddad6ffb88 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -368,6 +368,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
def test_identity_provider_set_description(self):
"""Set Identity Provider's description. """
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
@@ -412,6 +413,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
Set Identity Provider's ``enabled`` attribute to False.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
updated_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
@@ -459,6 +461,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
Set Identity Provider's ``enabled`` attribute to True.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
resources = fakes.FakeResource(
@@ -495,6 +498,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
Set Identity Provider's ``enabled`` attribute to True.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
self.new_remote_id = 'new_entity'
@@ -540,6 +544,7 @@ class TestIdentityProviderSet(TestIdentityProvider):
Set Identity Provider's ``enabled`` attribute to True.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
self.new_remote_id = 'new_entity'
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index f6e888858f..e811c0b644 100644
--- a/openstackclient/tests/identity/v3/test_mappings.py
+++ b/openstackclient/tests/identity/v3/test_mappings.py
@@ -33,71 +33,74 @@ class TestMapping(identity_fakes.TestFederatedIdentity):
class TestMappingCreate(TestMapping):
- def setUp(self):
- super(TestMappingCreate, self).setUp()
- self.mapping_mock.create.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
- loaded=True
- )
- self.cmd = mapping.CreateMapping(self.app, None)
- def test_create_mapping(self):
- arglist = [
- '--rules', identity_fakes.mapping_rules_file_path,
- identity_fakes.mapping_id
- ]
- verifylist = [
- ('mapping', identity_fakes.mapping_id),
- ('rules', identity_fakes.mapping_rules_file_path)
- ]
+ def setUp(self):
+ super(TestMappingCreate, self).setUp()
+ self.mapping_mock.create.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+ loaded=True
+ )
+ self.cmd = mapping.CreateMapping(self.app, None)
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+ def test_create_mapping(self):
+ arglist = [
+ '--rules', identity_fakes.mapping_rules_file_path,
+ identity_fakes.mapping_id
+ ]
+ verifylist = [
+ ('mapping', identity_fakes.mapping_id),
+ ('rules', identity_fakes.mapping_rules_file_path)
+ ]
- mocker = mock.Mock()
- mocker.return_value = identity_fakes.MAPPING_RULES
- with mock.patch("openstackclient.identity.v3.mapping."
- "CreateMapping._read_rules", mocker):
- columns, data = self.cmd.take_action(parsed_args)
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
- self.mapping_mock.create.assert_called_with(
- mapping_id=identity_fakes.mapping_id,
- rules=identity_fakes.MAPPING_RULES)
+ mocker = mock.Mock()
+ mocker.return_value = identity_fakes.MAPPING_RULES
+ with mock.patch("openstackclient.identity.v3.mapping."
+ "CreateMapping._read_rules", mocker):
+ columns, data = self.cmd.take_action(parsed_args)
- collist = ('id', 'rules')
- self.assertEqual(collist, columns)
+ self.mapping_mock.create.assert_called_with(
+ mapping_id=identity_fakes.mapping_id,
+ rules=identity_fakes.MAPPING_RULES)
- datalist = (identity_fakes.mapping_id,
- identity_fakes.MAPPING_RULES)
- self.assertEqual(datalist, data)
+ collist = ('id', 'rules')
+ self.assertEqual(collist, columns)
+
+ datalist = (identity_fakes.mapping_id,
+ identity_fakes.MAPPING_RULES)
+ self.assertEqual(datalist, data)
class TestMappingDelete(TestMapping):
- def setUp(self):
- super(TestMappingDelete, self).setUp()
- self.mapping_mock.get.return_value = fakes.FakeResource(
- None,
- copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
- loaded=True)
- self.mapping_mock.delete.return_value = None
- self.cmd = mapping.DeleteMapping(self.app, None)
+ def setUp(self):
+ super(TestMappingDelete, self).setUp()
+ self.mapping_mock.get.return_value = fakes.FakeResource(
+ None,
+ copy.deepcopy(identity_fakes.MAPPING_RESPONSE),
+ loaded=True)
- def test_delete_mapping(self):
- arglist = [
- identity_fakes.mapping_id
- ]
- verifylist = [
- ('mapping', identity_fakes.mapping_id)
- ]
+ self.mapping_mock.delete.return_value = None
+ self.cmd = mapping.DeleteMapping(self.app, None)
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
- self.cmd.take_action(parsed_args)
- self.mapping_mock.delete.assert_called_with(
- identity_fakes.mapping_id)
+ def test_delete_mapping(self):
+ arglist = [
+ identity_fakes.mapping_id
+ ]
+ verifylist = [
+ ('mapping', identity_fakes.mapping_id)
+ ]
+
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+ self.cmd.take_action(parsed_args)
+ self.mapping_mock.delete.assert_called_with(
+ identity_fakes.mapping_id)
class TestMappingList(TestMapping):
+
def setUp(self):
super(TestMappingList, self).setUp()
self.mapping_mock.get.return_value = fakes.FakeResource(
@@ -141,6 +144,7 @@ class TestMappingList(TestMapping):
class TestMappingShow(TestMapping):
+
def setUp(self):
super(TestMappingShow, self).setUp()
diff --git a/openstackclient/tests/identity/v3/test_role_assignment.py b/openstackclient/tests/identity/v3/test_role_assignment.py
index 5def76327a..8956b74fb3 100644
--- a/openstackclient/tests/identity/v3/test_role_assignment.py
+++ b/openstackclient/tests/identity/v3/test_role_assignment.py
@@ -557,7 +557,7 @@ class TestRoleAssignmentList(TestRoleAssignment):
'@'.join([identity_fakes.user_name, identity_fakes.domain_name]),
'',
'@'.join([identity_fakes.project_name,
- identity_fakes.domain_name]),
+ identity_fakes.domain_name]),
'',
False
), (identity_fakes.role_name,
diff --git a/openstackclient/tests/identity/v3/test_service_provider.py b/openstackclient/tests/identity/v3/test_service_provider.py
index fb7576f1cc..39f779d0f7 100644
--- a/openstackclient/tests/identity/v3/test_service_provider.py
+++ b/openstackclient/tests/identity/v3/test_service_provider.py
@@ -305,6 +305,7 @@ class TestServiceProviderSet(TestServiceProvider):
Set Service Provider's ``enabled`` attribute to False.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
updated_sp = copy.deepcopy(service_fakes.SERVICE_PROVIDER)
@@ -343,6 +344,7 @@ class TestServiceProviderSet(TestServiceProvider):
Set Service Provider's ``enabled`` attribute to True.
"""
+
def prepare(self):
"""Prepare fake return objects before the test is executed"""
resources = fakes.FakeResource(
diff --git a/openstackclient/tests/image/v1/fakes.py b/openstackclient/tests/image/v1/fakes.py
index 95a8a39ceb..1e49f17325 100644
--- a/openstackclient/tests/image/v1/fakes.py
+++ b/openstackclient/tests/image/v1/fakes.py
@@ -53,6 +53,7 @@ IMAGE_data = tuple((IMAGE_output[x] for x in sorted(IMAGE_output)))
class FakeImagev1Client(object):
+
def __init__(self, **kwargs):
self.images = mock.Mock()
self.images.resource_class = fakes.FakeResource(None, {})
@@ -61,6 +62,7 @@ class FakeImagev1Client(object):
class TestImagev1(utils.TestCommand):
+
def setUp(self):
super(TestImagev1, self).setUp()
diff --git a/openstackclient/tests/image/v2/fakes.py b/openstackclient/tests/image/v2/fakes.py
index 5441a3e2ab..3555d2d4ed 100644
--- a/openstackclient/tests/image/v2/fakes.py
+++ b/openstackclient/tests/image/v2/fakes.py
@@ -148,6 +148,7 @@ IMAGE_schema = {
class FakeImagev2Client(object):
+
def __init__(self, **kwargs):
self.images = mock.Mock()
self.images.resource_class = fakes.FakeResource(None, {})
@@ -158,6 +159,7 @@ class FakeImagev2Client(object):
class TestImagev2(utils.TestCommand):
+
def setUp(self):
super(TestImagev2, self).setUp()
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index de37512f07..b8e137f81c 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -381,7 +381,7 @@ class TestAddProjectToImage(TestImage):
arglist = [
image_fakes.image_id,
identity_fakes.project_id,
- ]
+ ]
verifylist = [
('image', image_fakes.image_id),
('project', identity_fakes.project_id),
diff --git a/openstackclient/tests/network/test_common.py b/openstackclient/tests/network/test_common.py
index 4700c66a9e..48608734a2 100644
--- a/openstackclient/tests/network/test_common.py
+++ b/openstackclient/tests/network/test_common.py
@@ -46,6 +46,7 @@ def _add_compute_argument(parser):
class FakeNetworkAndComputeCommand(common.NetworkAndComputeCommand):
+
def update_parser_common(self, parser):
return _add_common_argument(parser)
@@ -63,6 +64,7 @@ class FakeNetworkAndComputeCommand(common.NetworkAndComputeCommand):
class FakeNetworkAndComputeLister(common.NetworkAndComputeLister):
+
def update_parser_common(self, parser):
return _add_common_argument(parser)
@@ -80,6 +82,7 @@ class FakeNetworkAndComputeLister(common.NetworkAndComputeLister):
class FakeNetworkAndComputeShowOne(common.NetworkAndComputeShowOne):
+
def update_parser_common(self, parser):
return _add_common_argument(parser)
@@ -97,6 +100,7 @@ class FakeNetworkAndComputeShowOne(common.NetworkAndComputeShowOne):
class TestNetworkAndCompute(utils.TestCommand):
+
def setUp(self):
super(TestNetworkAndCompute, self).setUp()
@@ -150,18 +154,21 @@ class TestNetworkAndCompute(utils.TestCommand):
class TestNetworkAndComputeCommand(TestNetworkAndCompute):
+
def setUp(self):
super(TestNetworkAndComputeCommand, self).setUp()
self.cmd = FakeNetworkAndComputeCommand(self.app, self.namespace)
class TestNetworkAndComputeLister(TestNetworkAndCompute):
+
def setUp(self):
super(TestNetworkAndComputeLister, self).setUp()
self.cmd = FakeNetworkAndComputeLister(self.app, self.namespace)
class TestNetworkAndComputeShowOne(TestNetworkAndCompute):
+
def setUp(self):
super(TestNetworkAndComputeShowOne, self).setUp()
self.cmd = FakeNetworkAndComputeShowOne(self.app, self.namespace)
diff --git a/openstackclient/tests/network/v2/fakes.py b/openstackclient/tests/network/v2/fakes.py
index c24410e120..ea35a53758 100644
--- a/openstackclient/tests/network/v2/fakes.py
+++ b/openstackclient/tests/network/v2/fakes.py
@@ -51,11 +51,13 @@ def create_extension():
class FakeNetworkV2Client(object):
+
def __init__(self, **kwargs):
self.extensions = mock.Mock(return_value=[create_extension()])
class TestNetworkV2(utils.TestCommand):
+
def setUp(self):
super(TestNetworkV2, self).setUp()
diff --git a/openstackclient/tests/network/v2/test_subnet.py b/openstackclient/tests/network/v2/test_subnet.py
index c02dc40736..e1e663f462 100644
--- a/openstackclient/tests/network/v2/test_subnet.py
+++ b/openstackclient/tests/network/v2/test_subnet.py
@@ -20,6 +20,7 @@ from openstackclient.tests import utils as tests_utils
class TestSubnet(network_fakes.TestNetworkV2):
+
def setUp(self):
super(TestSubnet, self).setUp()
diff --git a/openstackclient/tests/network/v2/test_subnet_pool.py b/openstackclient/tests/network/v2/test_subnet_pool.py
index 0ee5a7145e..c4e3340de7 100644
--- a/openstackclient/tests/network/v2/test_subnet_pool.py
+++ b/openstackclient/tests/network/v2/test_subnet_pool.py
@@ -20,6 +20,7 @@ from openstackclient.tests import utils as tests_utils
class TestSubnetPool(network_fakes.TestNetworkV2):
+
def setUp(self):
super(TestSubnetPool, self).setUp()
diff --git a/openstackclient/tests/object/v1/fakes.py b/openstackclient/tests/object/v1/fakes.py
index 986ab2f30b..b9e86db759 100644
--- a/openstackclient/tests/object/v1/fakes.py
+++ b/openstackclient/tests/object/v1/fakes.py
@@ -76,6 +76,7 @@ OBJECT_2 = {
class TestObjectv1(utils.TestCommand):
+
def setUp(self):
super(TestObjectv1, self).setUp()
diff --git a/openstackclient/tests/object/v1/test_container.py b/openstackclient/tests/object/v1/test_container.py
index 6982295de3..41bc6e8c6d 100644
--- a/openstackclient/tests/object/v1/test_container.py
+++ b/openstackclient/tests/object/v1/test_container.py
@@ -26,6 +26,7 @@ AUTH_URL = "http://0.0.0.0"
class FakeClient(object):
+
def __init__(self, endpoint=None, **kwargs):
self.endpoint = AUTH_URL
self.token = AUTH_TOKEN
diff --git a/openstackclient/tests/object/v1/test_object.py b/openstackclient/tests/object/v1/test_object.py
index 990e4f46fa..e11f78a130 100644
--- a/openstackclient/tests/object/v1/test_object.py
+++ b/openstackclient/tests/object/v1/test_object.py
@@ -26,6 +26,7 @@ AUTH_URL = "http://0.0.0.0"
class TestObject(object_fakes.TestObjectv1):
+
def setUp(self):
super(TestObject, self).setUp()
self.app.client_manager.object_store = object_store.APIv1(
diff --git a/openstackclient/tests/object/v1/test_object_all.py b/openstackclient/tests/object/v1/test_object_all.py
index 89286b00e4..2a1bf05905 100644
--- a/openstackclient/tests/object/v1/test_object_all.py
+++ b/openstackclient/tests/object/v1/test_object_all.py
@@ -20,6 +20,7 @@ from openstackclient.tests.object.v1 import fakes as object_fakes
class TestObjectAll(object_fakes.TestObjectv1):
+
def setUp(self):
super(TestObjectAll, self).setUp()
diff --git a/openstackclient/tests/test_shell.py b/openstackclient/tests/test_shell.py
index 80b181611a..4a8968cf40 100644
--- a/openstackclient/tests/test_shell.py
+++ b/openstackclient/tests/test_shell.py
@@ -161,6 +161,7 @@ def fake_execute(shell, cmd):
class TestShell(utils.TestCase):
+
def setUp(self):
super(TestShell, self).setUp()
patch = "openstackclient.shell.OpenStackShell.run_subcommand"
@@ -280,6 +281,7 @@ class TestShell(utils.TestCase):
class TestShellHelp(TestShell):
"""Test the deferred help flag"""
+
def setUp(self):
super(TestShellHelp, self).setUp()
self.orig_env, os.environ = os.environ, {}
@@ -304,6 +306,7 @@ class TestShellHelp(TestShell):
class TestShellOptions(TestShell):
+
def setUp(self):
super(TestShellOptions, self).setUp()
self.orig_env, os.environ = os.environ, {}
@@ -391,6 +394,7 @@ class TestShellOptions(TestShell):
class TestShellTokenAuthEnv(TestShell):
+
def setUp(self):
super(TestShellTokenAuthEnv, self).setUp()
env = {
@@ -438,6 +442,7 @@ class TestShellTokenAuthEnv(TestShell):
class TestShellTokenEndpointAuthEnv(TestShell):
+
def setUp(self):
super(TestShellTokenEndpointAuthEnv, self).setUp()
env = {
@@ -485,6 +490,7 @@ class TestShellTokenEndpointAuthEnv(TestShell):
class TestShellCli(TestShell):
+
def setUp(self):
super(TestShellCli, self).setUp()
env = {
@@ -706,6 +712,7 @@ class TestShellCli(TestShell):
class TestShellCliEnv(TestShell):
+
def setUp(self):
super(TestShellCliEnv, self).setUp()
env = {
diff --git a/openstackclient/tests/utils.py b/openstackclient/tests/utils.py
index d9abd572bf..d3f3853f5a 100644
--- a/openstackclient/tests/utils.py
+++ b/openstackclient/tests/utils.py
@@ -28,6 +28,7 @@ class ParserException(Exception):
class TestCase(testtools.TestCase):
+
def setUp(self):
testtools.TestCase.setUp(self)
diff --git a/openstackclient/tests/volume/v1/fakes.py b/openstackclient/tests/volume/v1/fakes.py
index c6b4f0b858..42673efaa7 100644
--- a/openstackclient/tests/volume/v1/fakes.py
+++ b/openstackclient/tests/volume/v1/fakes.py
@@ -130,11 +130,13 @@ QOS_WITH_ASSOCIATIONS = {
class FakeImagev1Client(object):
+
def __init__(self, **kwargs):
self.images = mock.Mock()
class FakeVolumev1Client(object):
+
def __init__(self, **kwargs):
self.volumes = mock.Mock()
self.volumes.resource_class = fakes.FakeResource(None, {})
@@ -151,6 +153,7 @@ class FakeVolumev1Client(object):
class TestVolumev1(utils.TestCommand):
+
def setUp(self):
super(TestVolumev1, self).setUp()
diff --git a/openstackclient/tests/volume/v1/test_qos_specs.py b/openstackclient/tests/volume/v1/test_qos_specs.py
index 7ecc8ee829..1a6c0fa4ed 100644
--- a/openstackclient/tests/volume/v1/test_qos_specs.py
+++ b/openstackclient/tests/volume/v1/test_qos_specs.py
@@ -34,6 +34,7 @@ class TestQos(volume_fakes.TestVolumev1):
class TestQosAssociate(TestQos):
+
def setUp(self):
super(TestQosAssociate, self).setUp()
@@ -183,6 +184,7 @@ class TestQosCreate(TestQos):
class TestQosDelete(TestQos):
+
def setUp(self):
super(TestQosDelete, self).setUp()
@@ -223,6 +225,7 @@ class TestQosDelete(TestQos):
class TestQosDisassociate(TestQos):
+
def setUp(self):
super(TestQosDisassociate, self).setUp()
@@ -277,6 +280,7 @@ class TestQosDisassociate(TestQos):
class TestQosList(TestQos):
+
def setUp(self):
super(TestQosList, self).setUp()
@@ -323,6 +327,7 @@ class TestQosList(TestQos):
class TestQosSet(TestQos):
+
def setUp(self):
super(TestQosSet, self).setUp()
@@ -354,6 +359,7 @@ class TestQosSet(TestQos):
class TestQosShow(TestQos):
+
def setUp(self):
super(TestQosShow, self).setUp()
@@ -405,6 +411,7 @@ class TestQosShow(TestQos):
class TestQosUnset(TestQos):
+
def setUp(self):
super(TestQosUnset, self).setUp()
diff --git a/openstackclient/tests/volume/v2/fakes.py b/openstackclient/tests/volume/v2/fakes.py
index cfc58bb4c3..61d9df3aa5 100644
--- a/openstackclient/tests/volume/v2/fakes.py
+++ b/openstackclient/tests/volume/v2/fakes.py
@@ -213,6 +213,7 @@ IMAGE = {
class FakeVolumeClient(object):
+
def __init__(self, **kwargs):
self.volumes = mock.Mock()
self.volumes.resource_class = fakes.FakeResource(None, {})
@@ -233,6 +234,7 @@ class FakeVolumeClient(object):
class TestVolume(utils.TestCommand):
+
def setUp(self):
super(TestVolume, self).setUp()
diff --git a/openstackclient/tests/volume/v2/test_backup.py b/openstackclient/tests/volume/v2/test_backup.py
index dc1d78776f..edb4eb8e73 100644
--- a/openstackclient/tests/volume/v2/test_backup.py
+++ b/openstackclient/tests/volume/v2/test_backup.py
@@ -33,6 +33,7 @@ class TestBackup(volume_fakes.TestVolume):
class TestBackupCreate(TestBackup):
+
def setUp(self):
super(TestBackupCreate, self).setUp()
@@ -78,6 +79,7 @@ class TestBackupCreate(TestBackup):
class TestBackupShow(TestBackup):
+
def setUp(self):
super(TestBackupShow, self).setUp()
@@ -105,6 +107,7 @@ class TestBackupShow(TestBackup):
class TestBackupDelete(TestBackup):
+
def setUp(self):
super(TestBackupDelete, self).setUp()
@@ -132,6 +135,7 @@ class TestBackupDelete(TestBackup):
class TestBackupRestore(TestBackup):
+
def setUp(self):
super(TestBackupRestore, self).setUp()
diff --git a/openstackclient/tests/volume/v2/test_qos_specs.py b/openstackclient/tests/volume/v2/test_qos_specs.py
index 403634a33f..c826925fda 100644
--- a/openstackclient/tests/volume/v2/test_qos_specs.py
+++ b/openstackclient/tests/volume/v2/test_qos_specs.py
@@ -34,6 +34,7 @@ class TestQos(volume_fakes.TestVolume):
class TestQosAssociate(TestQos):
+
def setUp(self):
super(TestQosAssociate, self).setUp()
@@ -184,6 +185,7 @@ class TestQosCreate(TestQos):
class TestQosDelete(TestQos):
+
def setUp(self):
super(TestQosDelete, self).setUp()
@@ -224,6 +226,7 @@ class TestQosDelete(TestQos):
class TestQosDisassociate(TestQos):
+
def setUp(self):
super(TestQosDisassociate, self).setUp()
@@ -278,6 +281,7 @@ class TestQosDisassociate(TestQos):
class TestQosList(TestQos):
+
def setUp(self):
super(TestQosList, self).setUp()
@@ -324,6 +328,7 @@ class TestQosList(TestQos):
class TestQosSet(TestQos):
+
def setUp(self):
super(TestQosSet, self).setUp()
@@ -355,6 +360,7 @@ class TestQosSet(TestQos):
class TestQosShow(TestQos):
+
def setUp(self):
super(TestQosShow, self).setUp()
@@ -406,6 +412,7 @@ class TestQosShow(TestQos):
class TestQosUnset(TestQos):
+
def setUp(self):
super(TestQosUnset, self).setUp()
diff --git a/openstackclient/tests/volume/v2/test_snapshot.py b/openstackclient/tests/volume/v2/test_snapshot.py
index 1c1dd43789..b4fb004bee 100644
--- a/openstackclient/tests/volume/v2/test_snapshot.py
+++ b/openstackclient/tests/volume/v2/test_snapshot.py
@@ -31,6 +31,7 @@ class TestSnapshot(volume_fakes.TestVolume):
class TestSnapshotCreate(TestSnapshot):
+
def setUp(self):
super(TestSnapshotCreate, self).setUp()
@@ -76,6 +77,7 @@ class TestSnapshotCreate(TestSnapshot):
class TestSnapshotShow(TestSnapshot):
+
def setUp(self):
super(TestSnapshotShow, self).setUp()
@@ -103,6 +105,7 @@ class TestSnapshotShow(TestSnapshot):
class TestSnapshotDelete(TestSnapshot):
+
def setUp(self):
super(TestSnapshotDelete, self).setUp()
@@ -130,6 +133,7 @@ class TestSnapshotDelete(TestSnapshot):
class TestSnapshotSet(TestSnapshot):
+
def setUp(self):
super(TestSnapshotSet, self).setUp()
@@ -171,6 +175,7 @@ class TestSnapshotSet(TestSnapshot):
class TestSnapshotUnset(TestSnapshot):
+
def setUp(self):
super(TestSnapshotUnset, self).setUp()
@@ -247,7 +252,7 @@ class TestSnapshotList(TestSnapshot):
volume_fakes.snapshot_description,
"available",
volume_fakes.snapshot_size
- ),)
+ ),)
self.assertEqual(datalist, tuple(data))
def test_snapshot_list_with_options(self):
diff --git a/openstackclient/tests/volume/v2/test_type.py b/openstackclient/tests/volume/v2/test_type.py
index 9bf6036399..f394aff324 100644
--- a/openstackclient/tests/volume/v2/test_type.py
+++ b/openstackclient/tests/volume/v2/test_type.py
@@ -147,7 +147,7 @@ class TestTypeList(TestType):
datalist = ((
volume_fakes.type_id,
volume_fakes.type_name,
- ),)
+ ),)
self.assertEqual(datalist, tuple(data))
def test_type_list_with_options(self):
@@ -166,11 +166,12 @@ class TestTypeList(TestType):
volume_fakes.type_name,
volume_fakes.type_description,
"foo='bar'"
- ),)
+ ),)
self.assertEqual(datalist, tuple(data))
class TestTypeShow(TestType):
+
def setUp(self):
super(TestTypeShow, self).setUp()
@@ -314,6 +315,7 @@ class TestTypeUnset(TestType):
class TestTypeDelete(TestType):
+
def setUp(self):
super(TestTypeDelete, self).setUp()
diff --git a/openstackclient/tests/volume/v2/test_volume.py b/openstackclient/tests/volume/v2/test_volume.py
index df43cb2b2a..cbca09b286 100644
--- a/openstackclient/tests/volume/v2/test_volume.py
+++ b/openstackclient/tests/volume/v2/test_volume.py
@@ -24,6 +24,7 @@ from openstackclient.volume.v2 import volume
class TestVolume(volume_fakes.TestVolume):
+
def setUp(self):
super(TestVolume, self).setUp()
@@ -377,6 +378,7 @@ class TestVolumeCreate(TestVolume):
class TestVolumeDelete(TestVolume):
+
def setUp(self):
super(TestVolumeDelete, self).setUp()
@@ -726,6 +728,7 @@ class TestVolumeList(TestVolume):
class TestVolumeShow(TestVolume):
+
def setUp(self):
super(TestVolumeShow, self).setUp()
diff --git a/openstackclient/volume/v2/volume.py b/openstackclient/volume/v2/volume.py
index 87affd07d3..8f2122eb83 100644
--- a/openstackclient/volume/v2/volume.py
+++ b/openstackclient/volume/v2/volume.py
@@ -267,7 +267,7 @@ class ListVolume(command.Lister):
'Status',
'Size',
'Attachments',
- ]
+ ]
column_headers = copy.deepcopy(columns)
column_headers[1] = 'Display Name'
column_headers[4] = 'Attached to'