remove unnecessary FakeLog class in test code
The FakeLog defined in keystoneclient/tests/unit/test_http.py isn't used anywhere. This patch removes it. fixtures package already provides a FakeLogger for us to use, so we really don't need to maintain a private implementation, this patch removes FakeLog in test_auth_token_middleware and replaces it with fixtures.FakeLogger Change-Id: I6aaf761a9676edf5bd799d22b79497be1d423e7c
This commit is contained in:
parent
7c58da8435
commit
8506a6e071
@ -927,23 +927,15 @@ class CommonAuthTokenMiddlewareTest(object):
|
||||
"Keystone uri='https://keystone.example.com:1234'")
|
||||
|
||||
def test_request_no_token_log_message(self):
|
||||
class FakeLog(object):
|
||||
def __init__(self):
|
||||
self.msg = None
|
||||
self.debugmsg = None
|
||||
|
||||
def warning(self, msg=None, *args, **kwargs):
|
||||
self.msg = msg
|
||||
|
||||
def debug(self, msg=None, *args, **kwargs):
|
||||
self.debugmsg = msg
|
||||
|
||||
self.middleware.LOG = FakeLog()
|
||||
log_format = '[%(levelname)s] %(message)s'
|
||||
fixture = self.useFixture(fixtures.FakeLogger(level=logging.DEBUG,
|
||||
format=log_format))
|
||||
self.middleware.delay_auth_decision = False
|
||||
self.assertRaises(auth_token.InvalidUserToken,
|
||||
self.middleware._get_user_token_from_header, {})
|
||||
self.assertIsNotNone(self.middleware.LOG.msg)
|
||||
self.assertIsNotNone(self.middleware.LOG.debugmsg)
|
||||
self.assertIn(('[WARNING] Unable to find authentication token in '
|
||||
'headers'), fixture.output)
|
||||
self.assertIn('[DEBUG] Headers: {}', fixture.output)
|
||||
|
||||
def test_request_no_token_http(self):
|
||||
req = webob.Request.blank('/', environ={'REQUEST_METHOD': 'HEAD'})
|
||||
|
@ -39,18 +39,6 @@ def get_authed_client():
|
||||
return cl
|
||||
|
||||
|
||||
class FakeLog(object):
|
||||
def __init__(self):
|
||||
self.warn_log = str()
|
||||
self.debug_log = str()
|
||||
|
||||
def warn(self, msg=None, *args, **kwargs):
|
||||
self.warn_log = "%s\n%s" % (self.warn_log, (msg % args))
|
||||
|
||||
def debug(self, msg=None, *args, **kwargs):
|
||||
self.debug_log = "%s\n%s" % (self.debug_log, (msg % args))
|
||||
|
||||
|
||||
class ClientTest(utils.TestCase):
|
||||
|
||||
TEST_URL = 'http://127.0.0.1:5000/hi'
|
||||
|
Loading…
Reference in New Issue
Block a user