openstack/rally-openstack
Code Issues Proposed changes

Remove None as a redundant second argument to dict.get()

Browse Source 
`dict.get()` returns `None` by default if a key wasn't found.
Remove `None` as second argument to avoid redundancy.

Change-Id: If08b61fa0719f4b0465118d595bcc9895d1dcaf7
This commit is contained in:
chen-li
2016-01-25 20:03:10 +08:00
parent 87775bca81
commit a38382941d
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/fakes.py
View File

@@ -313,7 +313,7 @@ class FakeManager(object):
self.resources_order = []
def get(self, resource_uuid):
return self.cache.get(resource_uuid, None)
return self.cache.get(resource_uuid)
def delete(self, resource_uuid):
cached = self.get(resource_uuid)
@@ -348,7 +348,7 @@ class FakeServerManager(FakeManager):
self.images = image_mgr or FakeImageManager()
def get(self, resource_uuid):
server = self.cache.get(resource_uuid, None)
server = self.cache.get(resource_uuid)
if server is not None:
return server
raise nova_exceptions.NotFound("Server %s not found" % (resource_uuid))
@@ -389,7 +389,7 @@ class FakeImageManager(FakeManager):
super(FakeImageManager, self).__init__()
def get(self, resource_uuid):
image = self.cache.get(resource_uuid, None)
image = self.cache.get(resource_uuid)
if image is not None:
return image
raise exc.HTTPNotFound("Image %s not found" % (resource_uuid))

6
tests/unit/plugins/openstack/scenarios/manila/test_utils.py
View File

@@ -89,7 +89,7 @@ class ManilaScenarioTestCase(test.ScenarioTestCase):
self.assertEqual(fake_shares, result)
self.clients("manila").shares.list.assert_called_once_with(
detailed=params.get("detailed", True),
search_opts=params.get("search_opts", None))
search_opts=params.get("search_opts"))
def test__create_share_network(self):
fake_sn = mock.Mock()
@@ -141,7 +141,7 @@ class ManilaScenarioTestCase(test.ScenarioTestCase):
self.assertEqual(fake_share_networks, result)
self.clients("manila").share_networks.list.assert_called_once_with(
detailed=params.get("detailed", True),
search_opts=params.get("search_opts", None))
search_opts=params.get("search_opts"))
@ddt.data(
{},
@@ -158,7 +158,7 @@ class ManilaScenarioTestCase(test.ScenarioTestCase):
self.assertEqual(fake_share_servers, result)
self.admin_clients(
"manila").share_servers.list.assert_called_once_with(
search_opts=params.get("search_opts", None))
search_opts=params.get("search_opts"))
@ddt.data("ldap", "kerberos", "active_directory")
def test__create_security_service(self, ss_type):