summaryrefslogtreecommitdiff
path: root/openstackclient/tests/identity/v3/test_mappings.py
diff options
context:
space:
mode:
authorBrandon Palm <bapalm@us.ibm.com>2016-02-23 10:38:58 -0600
committerBrandon Palm <bapalm@us.ibm.com>2016-02-23 10:38:58 -0600
commitf49f0fead2933ace4cb85c70bd14d13d0c479e6a (patch)
tree8d3dacfb9fb599c23fdb489ad84daac804cab714 /openstackclient/tests/identity/v3/test_mappings.py
parent02e5b6f41d2b5f026ce1f1f5b7026d5968a7c20f (diff)
downloadpython-openstackclient-f49f0fead2933ace4cb85c70bd14d13d0c479e6a.tar.gz
Fixed a bunch of spacing
Nothing too complicated here. I fixed a bunch of spacing issues that I saw in OSC. Change-Id: I935ab48e7c5bac5f88ecdb3a05f73fb44fc9f41d
Diffstat (limited to 'openstackclient/tests/identity/v3/test_mappings.py')
-rw-r--r--openstackclient/tests/identity/v3/test_mappings.py116
1 files changed, 60 insertions, 56 deletions
diff --git a/openstackclient/tests/identity/v3/test_mappings.py b/openstackclient/tests/identity/v3/test_mappings.py
index f6e88885..e811c0b6 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)
- ]
-
- parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
- 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)
-
- self.mapping_mock.create.assert_called_with(
- mapping_id=identity_fakes.mapping_id,
- rules=identity_fakes.MAPPING_RULES)
-
- collist = ('id', 'rules')
- self.assertEqual(collist, columns)
-
- datalist = (identity_fakes.mapping_id,
- identity_fakes.MAPPING_RULES)
- self.assertEqual(datalist, data)
+
+ 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)
+ ]
+
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ 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)
+
+ self.mapping_mock.create.assert_called_with(
+ mapping_id=identity_fakes.mapping_id,
+ rules=identity_fakes.MAPPING_RULES)
+
+ 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()