From d7d56dfac45ffc799f2b81300169ce6d7b25b841 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Thu, 29 May 2014 02:17:46 -0400 Subject: [PATCH] Clean up oauth auth plugin code 1) remove unnecessary setup 2) remove unnecessary init 3) change order of assertEquals Change-Id: I852f6ba79e871e286d49836dab105ac18b6519a6 Closes-Bug: #1324379 --- keystoneclient/tests/v3/test_oauth1.py | 5 +---- keystoneclient/v3/contrib/oauth1/auth.py | 3 --- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/keystoneclient/tests/v3/test_oauth1.py b/keystoneclient/tests/v3/test_oauth1.py index 28464e1bf..f7638ada4 100644 --- a/keystoneclient/tests/v3/test_oauth1.py +++ b/keystoneclient/tests/v3/test_oauth1.py @@ -260,7 +260,7 @@ class AuthenticateWithOAuthTests(TokenTests): access_secret=access_secret) s = session.Session(auth=a) t = s.get_token() - self.assertEqual(t, self.TEST_TOKEN) + self.assertEqual(self.TEST_TOKEN, t) OAUTH_REQUEST_BODY = { "auth": { @@ -286,9 +286,6 @@ class AuthenticateWithOAuthTests(TokenTests): class TestOAuthLibModule(utils.TestCase): - def setUp(self): - super(TestOAuthLibModule, self).setUp() - def test_no_oauthlib_installed(self): with mock.patch.object(auth, 'oauth1', None): self.assertRaises(NotImplementedError, diff --git a/keystoneclient/v3/contrib/oauth1/auth.py b/keystoneclient/v3/contrib/oauth1/auth.py index e13c050f1..19446f070 100644 --- a/keystoneclient/v3/contrib/oauth1/auth.py +++ b/keystoneclient/v3/contrib/oauth1/auth.py @@ -53,6 +53,3 @@ class OAuthMethod(v3.AuthMethod): class OAuth(v3._AuthConstructor): _auth_method_class = OAuthMethod - - def __init__(self, auth_url, **kwargs): - super(OAuth, self).__init__(auth_url, **kwargs)