From 9e899fd358f0623bb9ee90d4e110c43ce8322881 Mon Sep 17 00:00:00 2001 From: David Stanek Date: Wed, 12 Mar 2014 19:23:29 +0000 Subject: [PATCH] Cleanup of test_cert_setup tests - Removed the redundant calls to load backends and fixtures - Only create a controller in the one test that needs it Change-Id: I6c068452479ceb23010396f14fe6d155ac954b04 --- keystone/tests/test_cert_setup.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/keystone/tests/test_cert_setup.py b/keystone/tests/test_cert_setup.py index b8a6424b3..233be26a1 100644 --- a/keystone/tests/test_cert_setup.py +++ b/keystone/tests/test_cert_setup.py @@ -19,7 +19,6 @@ import shutil from keystone.common import openssl from keystone import exception from keystone import tests -from keystone.tests import default_fixtures from keystone.tests import rest from keystone import token @@ -37,9 +36,6 @@ class CertSetupTestCase(rest.RestfulTestCase): def setUp(self): super(CertSetupTestCase, self).setUp() - self.load_backends() - self.load_fixtures(default_fixtures) - self.controller = token.controllers.Auth() def cleanup_ssldir(): try: @@ -68,6 +64,8 @@ class CertSetupTestCase(rest.RestfulTestCase): keyfile=os.path.join(KEYDIR, 'keystonekey.pem')) def test_can_handle_missing_certs(self): + controller = token.controllers.Auth() + self.config_fixture.config(group='signing', certfile='invalid') user = { 'id': 'fake1', @@ -83,7 +81,7 @@ class CertSetupTestCase(rest.RestfulTestCase): } self.identity_api.create_user(user['id'], user) self.assertRaises(exception.UnexpectedError, - self.controller.authenticate, + controller.authenticate, {}, body_dict) def test_create_pki_certs(self):