3 files changed, 13 insertions, 28 deletions
diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py
index cac68f1d..280d9227 100644
--- a/openstackclient/tests/identity/v3/test_identity_provider.py
+++ b/openstackclient/tests/identity/v3/test_identity_provider.py
@@ -24,9 +24,8 @@ class TestIdentityProvider(identity_fakes.TestFederatedIdentity):
     def setUp(self):
         super(TestIdentityProvider, self).setUp()
 
-        self.identity_providers_mock = self.app.client_manager.\
-            identity.identity_providers
-
+        identity_lib = self.app.client_manager.identity
+        self.identity_providers_mock = identity_lib.identity_providers
         self.identity_providers_mock.reset_mock()
 
 
@@ -35,17 +34,10 @@ class TestIdentityProviderCreate(TestIdentityProvider):
     def setUp(self):
         super(TestIdentityProviderCreate, self).setUp()
 
-        self.identity_providers_mock.create.return_value = \
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.IDENTITY_PROVIDER),
-                loaded=True,
-            )
-
-        self.cmd = identity_provider.CreateIdentityProvider(
-            self.app,
-            None,
-        )
+        copied_idp = copy.deepcopy(identity_fakes.IDENTITY_PROVIDER)
+        resource = fakes.FakeResource(None, copied_idp, loaded=True)
+        self.identity_providers_mock.create.return_value = resource
+        self.cmd = identity_provider.CreateIdentityProvider(self.app, None)
 
     def test_create_identity_provider_no_options(self):
         arglist = [
@@ -116,12 +108,9 @@ class TestIdentityProviderCreate(TestIdentityProvider):
         IDENTITY_PROVIDER['enabled'] = False
         IDENTITY_PROVIDER['description'] = None
 
-        self.identity_providers_mock.create.return_value = \
-            fakes.FakeResource(
-                None,
-                IDENTITY_PROVIDER,
-                loaded=True,
-            )
+        resource = fakes.FakeResource(None, IDENTITY_PROVIDER, loaded=True)
+        self.identity_providers_mock.create.return_value = resource
+
         arglist = [
             '--disable',
             identity_fakes.idp_id,
diff --git a/openstackclient/tests/identity/v3/test_oauth.py b/openstackclient/tests/identity/v3/test_oauth.py
index f796d476..15ba04e3 100644
--- a/openstackclient/tests/identity/v3/test_oauth.py
+++ b/openstackclient/tests/identity/v3/test_oauth.py
@@ -77,13 +77,9 @@ class TestRequestTokenAuthorize(TestOAuth1):
     def setUp(self):
         super(TestRequestTokenAuthorize, self).setUp()
 
-        self.request_tokens_mock.authorize.return_value = \
-            fakes.FakeResource(
-                None,
-                copy.deepcopy(identity_fakes.OAUTH_VERIFIER),
-                loaded=True,
-            )
-
+        copied_verifier = copy.deepcopy(identity_fakes.OAUTH_VERIFIER)
+        resource = fakes.FakeResource(None, copied_verifier, loaded=True)
+        self.request_tokens_mock.authorize.return_value = resource
         self.cmd = token.AuthorizeRequestToken(self.app, None)
 
     def test_authorize_request_tokens(self):
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index b746a538..b014482a 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -139,7 +139,7 @@ class TestImageCreate(TestImage):
         self.assertEqual(image_fakes.IMAGE_columns, columns)
         self.assertEqual(image_fakes.IMAGE_data, data)
 
-    @mock.patch('__builtin__.open')
+    @mock.patch('six.moves.builtins.open')
     def test_image_create_file(self, open_mock):
         mock_exception = {
             'find.side_effect': exceptions.CommandError('x'),