openstack/python-keystoneclient
Code Issues Proposed changes

Seperate Client base test class

Browse Source 
Client tests are broadly seperated into v2 and v3. These folders don't
distinguish between the tests that are on v2/v3 auth and those that are
CRUD related. This means that the base v2 and v3 test class always
create a client object for the tests to use, even if they don't need it.

Whilst this isn't a big deal now, we want to be able to seperate only
those tests that require a client so we can test them with multiple
different styles of client.

Add a new ClientTestCase class that will construct a client object for
the tests that need it.

Change-Id: I61f463ac5e878107c1889672f4d4cf5874821363
This commit is contained in:
Jamie Lennox
2015-12-16 11:31:38 +11:00
parent 131366495c
commit 2dd67f8a00
32 changed files with 66 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
keystoneclient/tests/unit/v2_0/test_certificates.py
View File

@@ -17,7 +17,7 @@ from keystoneclient.tests.unit import client_fixtures
from keystoneclient.tests.unit.v2_0 import utils
class CertificateTests(utils.TestCase, testresources.ResourcedTestCase):
class CertificateTests(utils.ClientTestCase, testresources.ResourcedTestCase):
resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]

2
keystoneclient/tests/unit/v2_0/test_ec2.py
View File

@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v2_0 import utils
from keystoneclient.v2_0 import ec2
class EC2Tests(utils.TestCase):
class EC2Tests(utils.ClientTestCase):
def test_create(self):
user_id = 'usr'

2
keystoneclient/tests/unit/v2_0/test_endpoints.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
from keystoneclient.v2_0 import endpoints
class EndpointTests(utils.TestCase):
class EndpointTests(utils.ClientTestCase):
def setUp(self):
super(EndpointTests, self).setUp()
self.TEST_ENDPOINTS = {

2
keystoneclient/tests/unit/v2_0/test_extensions.py
View File

@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v2_0 import utils
from keystoneclient.v2_0 import extensions
class ExtensionTests(utils.TestCase):
class ExtensionTests(utils.ClientTestCase):
def setUp(self):
super(ExtensionTests, self).setUp()
self.TEST_EXTENSIONS = {

2
keystoneclient/tests/unit/v2_0/test_roles.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
from keystoneclient.v2_0 import roles
class RoleTests(utils.TestCase):
class RoleTests(utils.ClientTestCase):
def setUp(self):
super(RoleTests, self).setUp()

2
keystoneclient/tests/unit/v2_0/test_services.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v2_0 import utils
from keystoneclient.v2_0 import services
class ServiceTests(utils.TestCase):
class ServiceTests(utils.ClientTestCase):
def setUp(self):
super(ServiceTests, self).setUp()

2
keystoneclient/tests/unit/v2_0/test_tenants.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.v2_0 import tenants
from keystoneclient.v2_0 import users
class TenantTests(utils.TestCase):
class TenantTests(utils.ClientTestCase):
def setUp(self):
super(TenantTests, self).setUp()

2
keystoneclient/tests/unit/v2_0/test_tokens.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.v2_0 import client
from keystoneclient.v2_0 import tokens
class TokenTests(utils.TestCase):
class TokenTests(utils.ClientTestCase):
def test_delete(self):
id_ = uuid.uuid4().hex

2
keystoneclient/tests/unit/v2_0/test_users.py
View File

@@ -17,7 +17,7 @@ from keystoneclient.v2_0 import roles
from keystoneclient.v2_0 import users
class UserTests(utils.TestCase):
class UserTests(utils.ClientTestCase):
def setUp(self):
super(UserTests, self).setUp()
self.ADMIN_USER_ID = uuid.uuid4().hex

11
keystoneclient/tests/unit/v2_0/utils.py
View File

@@ -76,14 +76,17 @@ class TestCase(UnauthenticatedTestCase):
"name": "swift"
}]
def stub_auth(self, **kwargs):
self.stub_url('POST', ['tokens'], **kwargs)
class ClientTestCase(TestCase):
def setUp(self):
super(TestCase, self).setUp()
super(ClientTestCase, self).setUp()
# Creating a Client not using session is deprecated.
with self.deprecations.expect_deprecations_here():
self.client = client.Client(token=self.TEST_TOKEN,
auth_url=self.TEST_URL,
endpoint=self.TEST_URL)
def stub_auth(self, **kwargs):
self.stub_url('POST', ['tokens'], **kwargs)

11
keystoneclient/tests/unit/v3/test_auth_manager.py
View File

@@ -12,15 +12,12 @@
import uuid
from keystoneclient.auth.identity import v3
from keystoneclient import fixture
from keystoneclient import session
from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import auth
from keystoneclient.v3 import client
class AuthProjectsTest(utils.TestCase):
class AuthProjectsTest(utils.ClientTestCase):
def setUp(self):
super(AuthProjectsTest, self).setUp()
@@ -32,12 +29,6 @@ class AuthProjectsTest(utils.TestCase):
[],
json={'version': fixture.V3Discovery(self.TEST_URL)})
self.auth = v3.Password(auth_url=self.TEST_URL,
user_id=self.v3token.user_id,
password=uuid.uuid4().hex)
self.session = session.Session(auth=self.auth)
self.client = client.Client(session=self.session)
def create_resource(self, id=None, name=None, **kwargs):
kwargs['id'] = id or uuid.uuid4().hex
kwargs['name'] = name or uuid.uuid4().hex

2
keystoneclient/tests/unit/v3/test_auth_saml2.py
View File

@@ -655,7 +655,7 @@ class AuthenticateviaADFSTests(utils.TestCase):
self.assertEqual(saml2_fixtures.UNSCOPED_TOKEN['token'], token_json)
class SAMLGenerationTests(utils.TestCase):
class SAMLGenerationTests(utils.ClientTestCase):
def setUp(self):
super(SAMLGenerationTests, self).setUp()

2
keystoneclient/tests/unit/v3/test_credentials.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import credentials
class CredentialTests(utils.TestCase, utils.CrudTests):
class CredentialTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(CredentialTests, self).setUp()
self.key = 'credential'

2
keystoneclient/tests/unit/v3/test_domains.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import domains
class DomainTests(utils.TestCase, utils.CrudTests):
class DomainTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(DomainTests, self).setUp()
self.key = 'domain'

2
keystoneclient/tests/unit/v3/test_ec2.py
View File

@@ -14,7 +14,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import ec2
class EC2Tests(utils.TestCase):
class EC2Tests(utils.ClientTestCase):
def test_create(self):
user_id = 'usr'

2
keystoneclient/tests/unit/v3/test_endpoint_filter.py
View File

@@ -37,7 +37,7 @@ class EndpointTestUtils(object):
return kwargs
class EndpointFilterTests(utils.TestCase, EndpointTestUtils):
class EndpointFilterTests(utils.ClientTestCase, EndpointTestUtils):
"""Test project-endpoint associations (a.k.a. EndpointFilter Extension).
Endpoint filter provides associations between service endpoints and

2
keystoneclient/tests/unit/v3/test_endpoint_policy.py
View File

@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import test_endpoint_filter
from keystoneclient.tests.unit.v3 import utils
class EndpointPolicyTests(utils.TestCase,
class EndpointPolicyTests(utils.ClientTestCase,
test_endpoint_filter.EndpointTestUtils):
"""Test policy-endpoint associations (a.k.a. EndpointPolicy Extension)."""

2
keystoneclient/tests/unit/v3/test_endpoints.py
View File

@@ -17,7 +17,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import endpoints
class EndpointTests(utils.TestCase, utils.CrudTests):
class EndpointTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(EndpointTests, self).setUp()
self.key = 'endpoint'

16
keystoneclient/tests/unit/v3/test_federation.py
View File

@@ -26,7 +26,7 @@ from keystoneclient.v3 import domains
from keystoneclient.v3 import projects
class IdentityProviderTests(utils.TestCase, utils.CrudTests):
class IdentityProviderTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(IdentityProviderTests, self).setUp()
self.key = 'identity_provider'
@@ -88,7 +88,7 @@ class IdentityProviderTests(utils.TestCase, utils.CrudTests):
self.assertEntityRequestBodyIs(req_ref)
class MappingTests(utils.TestCase, utils.CrudTests):
class MappingTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(MappingTests, self).setUp()
self.key = 'mapping'
@@ -122,7 +122,7 @@ class MappingTests(utils.TestCase, utils.CrudTests):
self.assertEntityRequestBodyIs(manager_ref)
class ProtocolTests(utils.TestCase, utils.CrudTests):
class ProtocolTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(ProtocolTests, self).setUp()
self.key = 'protocol'
@@ -327,14 +327,14 @@ class ProtocolTests(utils.TestCase, utils.CrudTests):
self.assertEntityRequestBodyIs(request_body)
class EntityManagerTests(utils.TestCase):
class EntityManagerTests(utils.ClientTestCase):
def test_create_object_expect_fail(self):
self.assertRaises(TypeError,
base.EntityManager,
self.client)
class FederationProjectTests(utils.TestCase):
class FederationProjectTests(utils.ClientTestCase):
def setUp(self):
super(FederationProjectTests, self).setUp()
@@ -364,7 +364,7 @@ class FederationProjectTests(utils.TestCase):
self.assertIsInstance(project, self.model)
class FederationDomainTests(utils.TestCase):
class FederationDomainTests(utils.ClientTestCase):
def setUp(self):
super(FederationDomainTests, self).setUp()
@@ -394,7 +394,7 @@ class FederationDomainTests(utils.TestCase):
self.assertIsInstance(domain, self.model)
class FederatedTokenTests(utils.TestCase):
class FederatedTokenTests(utils.ClientTestCase):
def setUp(self):
super(FederatedTokenTests, self).setUp()
@@ -416,7 +416,7 @@ class FederatedTokenTests(utils.TestCase):
self.assertIsNone(self.federated_token.user_domain_id)
class ServiceProviderTests(utils.TestCase, utils.CrudTests):
class ServiceProviderTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(ServiceProviderTests, self).setUp()
self.key = 'service_provider'

2
keystoneclient/tests/unit/v3/test_groups.py
View File

@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import groups
class GroupTests(utils.TestCase, utils.CrudTests):
class GroupTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(GroupTests, self).setUp()
self.key = 'group'

20
keystoneclient/tests/unit/v3/test_oauth1.py
View File

@@ -33,15 +33,11 @@ except ImportError:
oauth1 = None
class BaseTest(utils.TestCase):
class ConsumerTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(BaseTest, self).setUp()
if oauth1 is None:
self.skipTest('oauthlib package not available')
class ConsumerTests(BaseTest, utils.CrudTests):
def setUp(self):
super(ConsumerTests, self).setUp()
self.key = 'consumer'
self.collection_key = 'consumers'
@@ -79,7 +75,7 @@ class ConsumerTests(BaseTest, utils.CrudTests):
self.assertEqual(consumer_id, consumer.id)
class TokenTests(BaseTest):
class TokenTests(object):
def _new_oauth_token(self):
key = uuid.uuid4().hex
secret = uuid.uuid4().hex
@@ -122,8 +118,11 @@ class TokenTests(BaseTest):
return parameters
class RequestTokenTests(TokenTests):
class RequestTokenTests(utils.ClientTestCase, TokenTests):
def setUp(self):
if oauth1 is None:
self.skipTest('oauthlib package not available')
super(RequestTokenTests, self).setUp()
self.model = request_tokens.RequestToken
self.manager = self.client.oauth1.request_tokens
@@ -181,8 +180,11 @@ class RequestTokenTests(TokenTests):
oauth_client)
class AccessTokenTests(TokenTests):
class AccessTokenTests(utils.ClientTestCase, TokenTests):
def setUp(self):
if oauth1 is None:
self.skipTest('oauthlib package not available')
super(AccessTokenTests, self).setUp()
self.manager = self.client.oauth1.access_tokens
self.model = access_tokens.AccessToken
@@ -223,7 +225,7 @@ class AccessTokenTests(TokenTests):
oauth_client)
class AuthenticateWithOAuthTests(TokenTests):
class AuthenticateWithOAuthTests(utils.TestCase, TokenTests):
def setUp(self):
super(AuthenticateWithOAuthTests, self).setUp()
if oauth1 is None:

2
keystoneclient/tests/unit/v3/test_policies.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import policies
class PolicyTests(utils.TestCase, utils.CrudTests):
class PolicyTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(PolicyTests, self).setUp()
self.key = 'policy'

2
keystoneclient/tests/unit/v3/test_projects.py
View File

@@ -17,7 +17,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import projects
class ProjectTests(utils.TestCase, utils.CrudTests):
class ProjectTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(ProjectTests, self).setUp()
self.key = 'project'

2
keystoneclient/tests/unit/v3/test_regions.py
View File

@@ -18,7 +18,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import regions
class RegionTests(utils.TestCase, utils.CrudTests):
class RegionTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(RegionTests, self).setUp()
self.key = 'region'

2
keystoneclient/tests/unit/v3/test_role_assignments.py
View File

@@ -15,7 +15,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import role_assignments
class RoleAssignmentsTests(utils.TestCase, utils.CrudTests):
class RoleAssignmentsTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(RoleAssignmentsTests, self).setUp()

2
keystoneclient/tests/unit/v3/test_roles.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.v3 import roles
from testtools import matchers
class RoleTests(utils.TestCase, utils.CrudTests):
class RoleTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(RoleTests, self).setUp()
self.key = 'role'

2
keystoneclient/tests/unit/v3/test_services.py
View File

@@ -16,7 +16,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import services
class ServiceTests(utils.TestCase, utils.CrudTests):
class ServiceTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(ServiceTests, self).setUp()
self.key = 'service'

2
keystoneclient/tests/unit/v3/test_simple_cert.py
View File

@@ -17,7 +17,7 @@ from keystoneclient.tests.unit import client_fixtures
from keystoneclient.tests.unit.v3 import utils
class SimpleCertTests(utils.TestCase, testresources.ResourcedTestCase):
class SimpleCertTests(utils.ClientTestCase, testresources.ResourcedTestCase):
resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]

2
keystoneclient/tests/unit/v3/test_tokens.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.tests.unit import client_fixtures
from keystoneclient.tests.unit.v3 import utils
class TokenTests(utils.TestCase, testresources.ResourcedTestCase):
class TokenTests(utils.ClientTestCase, testresources.ResourcedTestCase):
resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]

2
keystoneclient/tests/unit/v3/test_trusts.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3.contrib import trusts
class TrustTests(utils.TestCase, utils.CrudTests):
class TrustTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(TrustTests, self).setUp()
self.key = 'trust'

2
keystoneclient/tests/unit/v3/test_users.py
View File

@@ -20,7 +20,7 @@ from keystoneclient.tests.unit.v3 import utils
from keystoneclient.v3 import users
class UserTests(utils.TestCase, utils.CrudTests):
class UserTests(utils.ClientTestCase, utils.CrudTests):
def setUp(self):
super(UserTests, self).setUp()
self.key = 'user'

21
keystoneclient/tests/unit/v3/utils.py
View File

@@ -127,15 +127,6 @@ class TestCase(UnauthenticatedTestCase):
"type": "object-store"
}]
def setUp(self):
super(TestCase, self).setUp()
# Creating a Client not using session is deprecated.
with self.deprecations.expect_deprecations_here():
self.client = client.Client(token=self.TEST_TOKEN,
auth_url=self.TEST_URL,
endpoint=self.TEST_URL)
def stub_auth(self, subject_token=None, **kwargs):
if not subject_token:
subject_token = self.TEST_TOKEN
@@ -153,6 +144,18 @@ class TestCase(UnauthenticatedTestCase):
self.stub_url('POST', ['auth', 'tokens'], **kwargs)
class ClientTestCase(TestCase):
def setUp(self):
super(TestCase, self).setUp()
# Creating a Client not using session is deprecated.
with self.deprecations.expect_deprecations_here():
self.client = client.Client(token=self.TEST_TOKEN,
auth_url=self.TEST_URL,
endpoint=self.TEST_URL)
class CrudTests(object):
key = None
collection_key = None