From a38382941d4df3123fe24f72c547f80c6b267a14 Mon Sep 17 00:00:00 2001 From: chen-li Date: Mon, 25 Jan 2016 20:03:10 +0800 Subject: [PATCH] Remove `None` as a redundant second argument to `dict.get()` `dict.get()` returns `None` by default if a key wasn't found. Remove `None` as second argument to avoid redundancy. Change-Id: If08b61fa0719f4b0465118d595bcc9895d1dcaf7 --- tests/unit/fakes.py | 6 +++--- tests/unit/plugins/openstack/scenarios/manila/test_utils.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/unit/fakes.py b/tests/unit/fakes.py index da391f4f..8146b4a3 100644 --- a/tests/unit/fakes.py +++ b/tests/unit/fakes.py @@ -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)) diff --git a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py b/tests/unit/plugins/openstack/scenarios/manila/test_utils.py index 76e2f69b..c758c84c 100644 --- a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py +++ b/tests/unit/plugins/openstack/scenarios/manila/test_utils.py @@ -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):