From 3bdfef827c4e5f957ab1edca8495375427e210cc Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Sat, 21 Jun 2014 00:38:18 -0400 Subject: [PATCH] Remove backslash usage from a few tests Noticed these in the code, figured we should stick to not using backslashes if possible. Change-Id: I55e5402683141e14df7c2b38883b1f3cc2a6bb6a --- .../identity/v3/test_identity_provider.py | 29 ++++++------------- .../tests/identity/v3/test_oauth.py | 10 ++----- 2 files changed, 12 insertions(+), 27 deletions(-) diff --git a/openstackclient/tests/identity/v3/test_identity_provider.py b/openstackclient/tests/identity/v3/test_identity_provider.py index cac68f1d48..280d922772 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 f796d4766a..15ba04e33f 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):