From e4be907e34e043888bb10b29655018dd2d4eb06e Mon Sep 17 00:00:00 2001 From: Jordan Pittier Date: Wed, 4 Jan 2017 19:17:35 +0100 Subject: [PATCH] Remove an unused variable in the BaseTestCase class The variable has become useless with the migration of the clients to tempest/lib. Change-Id: I98b655026a9cf2f9ba6d94d98c20fa46cc5dddbd --- tempest/clients.py | 3 +-- tempest/common/credentials_factory.py | 5 ++--- tempest/test.py | 4 +--- 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/tempest/clients.py b/tempest/clients.py index e3466e5189..838f12817e 100644 --- a/tempest/clients.py +++ b/tempest/clients.py @@ -40,12 +40,11 @@ class Manager(clients.ServiceClients): } default_params_with_timeout_values.update(default_params) - def __init__(self, credentials, service=None, scope='project'): + def __init__(self, credentials, scope='project'): """Initialization of Manager class. Setup all services clients and make them available for tests cases. :param credentials: type Credentials or TestResources - :param service: Service name :param scope: default scope for tokens produced by the auth provider """ _, identity_uri = get_auth_provider_class(credentials) diff --git a/tempest/common/credentials_factory.py b/tempest/common/credentials_factory.py index bf8d30ef7a..e6b46ed1b0 100644 --- a/tempest/common/credentials_factory.py +++ b/tempest/common/credentials_factory.py @@ -233,7 +233,6 @@ def get_credentials(fill_in=True, identity_version=None, **kwargs): class AdminManager(clients.Manager): """Manager that uses admin credentials for its managed client objects""" - def __init__(self, service=None): + def __init__(self): super(AdminManager, self).__init__( - credentials=get_configured_admin_credentials(), - service=service) + credentials=get_configured_admin_credentials()) diff --git a/tempest/test.py b/tempest/test.py index 17dc94c226..039afa18b5 100644 --- a/tempest/test.py +++ b/tempest/test.py @@ -219,7 +219,6 @@ class BaseTestCase(testtools.testcase.WithAttributes, """ setUpClassCalled = False - _service = None # NOTE(andreaf) credentials holds a list of the credentials to be allocated # at class setup time. Credential types can be 'primary', 'alt', 'admin' or @@ -533,8 +532,7 @@ class BaseTestCase(testtools.testcase.WithAttributes, else: raise lib_exc.InvalidCredentials( "Invalid credentials type %s" % credential_type) - manager = cls.client_manager(credentials=creds.credentials, - service=cls._service) + manager = cls.client_manager(credentials=creds.credentials) # NOTE(andreaf) Ensure credentials have user and project id fields. # It may not be the case when using pre-provisioned credentials. manager.auth_provider.set_auth()