From 8506a6e071f4ae2b4c29a9cdf65bae9a3d002752 Mon Sep 17 00:00:00 2001
From: ZhiQiang Fan <aji.zqfan@gmail.com>
Date: Mon, 19 Oct 2015 01:01:56 -0600
Subject: [PATCH] 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
---
 .../tests/unit/test_auth_token_middleware.py  | 20 ++++++-------------
 keystoneclient/tests/unit/test_http.py        | 12 -----------
 2 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/keystoneclient/tests/unit/test_auth_token_middleware.py b/keystoneclient/tests/unit/test_auth_token_middleware.py
index 55c84bb59..e2e058714 100644
--- a/keystoneclient/tests/unit/test_auth_token_middleware.py
+++ b/keystoneclient/tests/unit/test_auth_token_middleware.py
@@ -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'})
diff --git a/keystoneclient/tests/unit/test_http.py b/keystoneclient/tests/unit/test_http.py
index 4c3785159..56f116c5a 100644
--- a/keystoneclient/tests/unit/test_http.py
+++ b/keystoneclient/tests/unit/test_http.py
@@ -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'