Merge "Remove kwargs from manager calls where not needed."

2 files changed, 21 insertions, 23 deletions

diff --git a/tests/test_backend.py b/tests/test_backend.py
index a43e92ae..7e4d820e 100644
--- a/tests/test_backend.py
+++ b/tests/test_backend.py
@@ -118,26 +118,25 @@ class IdentityTests(object):
         self.assertEqual(unicode_name, ref['name'])
 
     def test_get_project(self):
-        tenant_ref = self.identity_api.get_project(
-            tenant_id=self.tenant_bar['id'])
+        tenant_ref = self.identity_api.get_project(self.tenant_bar['id'])
         self.assertDictEqual(tenant_ref, self.tenant_bar)
 
     def test_get_project_404(self):
         self.assertRaises(exception.ProjectNotFound,
                           self.identity_api.get_project,
-                          tenant_id=uuid.uuid4().hex)
+                          uuid.uuid4().hex)
 
     def test_get_project_by_name(self):
         tenant_ref = self.identity_api.get_project_by_name(
-            tenant_name=self.tenant_bar['name'],
-            domain_id=DEFAULT_DOMAIN_ID)
+            self.tenant_bar['name'],
+            DEFAULT_DOMAIN_ID)
         self.assertDictEqual(tenant_ref, self.tenant_bar)
 
     def test_get_project_by_name_404(self):
         self.assertRaises(exception.ProjectNotFound,
                           self.identity_api.get_project_by_name,
-                          tenant_name=uuid.uuid4().hex,
-                          domain_id=DEFAULT_DOMAIN_ID)
+                          uuid.uuid4().hex,
+                          DEFAULT_DOMAIN_ID)
 
     def test_get_project_users(self):
         tenant_ref = self.identity_api.get_project_users(self.tenant_baz['id'])
@@ -152,10 +151,10 @@ class IdentityTests(object):
     def test_get_project_users_404(self):
         self.assertRaises(exception.ProjectNotFound,
                           self.identity_api.get_project_users,
-                          tenant_id=uuid.uuid4().hex)
+                          uuid.uuid4().hex)
 
     def test_get_user(self):
-        user_ref = self.identity_api.get_user(user_id=self.user_foo['id'])
+        user_ref = self.identity_api.get_user(self.user_foo['id'])
         # NOTE(termie): the password field is left in user_foo to make
         #               it easier to authenticate in tests, but should
         #               not be returned by the api
@@ -165,12 +164,12 @@ class IdentityTests(object):
     def test_get_user_404(self):
         self.assertRaises(exception.UserNotFound,
                           self.identity_api.get_user,
-                          user_id=uuid.uuid4().hex)
+                          uuid.uuid4().hex)
 
     def test_get_user_by_name(self):
         user_ref = self.identity_api.get_user_by_name(
-            user_name=self.user_foo['name'],
-            domain_id=DEFAULT_DOMAIN_ID)
+            self.user_foo['name'], DEFAULT_DOMAIN_ID)
+
         # NOTE(termie): the password field is left in user_foo to make
         #               it easier to authenticate in tests, but should
         #               not be returned by the api
@@ -180,19 +179,18 @@ class IdentityTests(object):
     def test_get_user_by_name_404(self):
         self.assertRaises(exception.UserNotFound,
                           self.identity_api.get_user_by_name,
-                          user_name=uuid.uuid4().hex,
-                          domain_id=DEFAULT_DOMAIN_ID)
+                          uuid.uuid4().hex,
+                          DEFAULT_DOMAIN_ID)
 
     def test_get_role(self):
-        role_ref = self.identity_api.get_role(
-            role_id=self.role_admin['id'])
+        role_ref = self.identity_api.get_role(self.role_admin['id'])
         role_ref_dict = dict((x, role_ref[x]) for x in role_ref)
         self.assertDictEqual(role_ref_dict, self.role_admin)
 
     def test_get_role_404(self):
         self.assertRaises(exception.RoleNotFound,
                           self.identity_api.get_role,
-                          role_id=uuid.uuid4().hex)
+                          uuid.uuid4().hex)
 
     def test_create_duplicate_role_name_fails(self):
         role = {'id': 'fake1',
diff --git a/tests/test_v3_identity.py b/tests/test_v3_identity.py
index 891f0c6a..f1e19c42 100644
--- a/tests/test_v3_identity.py
+++ b/tests/test_v3_identity.py
@@ -270,19 +270,19 @@ class IdentityTestCase(test_v3.RestfulTestCase):
         # Check all the domain2 relevant entities are gone
         self.assertRaises(exception.DomainNotFound,
                           self.identity_api.get_domain,
-                          domain_id=self.domain2['id'])
+                          self.domain2['id'])
         self.assertRaises(exception.ProjectNotFound,
                           self.identity_api.get_project,
-                          tenant_id=self.project2['id'])
+                          self.project2['id'])
         self.assertRaises(exception.GroupNotFound,
                           self.identity_api.get_group,
-                          group_id=self.group2['id'])
+                          self.group2['id'])
         self.assertRaises(exception.UserNotFound,
                           self.identity_api.get_user,
-                          user_id=self.user2['id'])
+                          self.user2['id'])
         self.assertRaises(exception.CredentialNotFound,
                           self.credential_api.get_credential,
-                          credential_id=self.credential2['id'])
+                          self.credential2['id'])
 
         # ...and that all self.domain entities are still here
         r = self.identity_api.get_domain(self.domain['id'])
@@ -523,7 +523,7 @@ class IdentityTestCase(test_v3.RestfulTestCase):
         # that reference this project
         self.assertRaises(exception.CredentialNotFound,
                           self.credential_api.get_credential,
-                          credential_id=self.credential['id'])
+                          self.credential['id'])
         # And the no tokens we remain valid
         tokens = self.token_api.list_tokens(self.user['id'])
         self.assertEquals(len(tokens), 0)