From 6ed9ec4194a233c4da8ea45e0687e9108aa6863c Mon Sep 17 00:00:00 2001 From: Jamie Lennox Date: Fri, 5 Dec 2014 14:05:29 +1000 Subject: [PATCH] Add a test to ensure the version check error _LC wasn't imported with the other log translation methods. This section of code was untested. We should enforce the behaviour to handle changes in this area. Change-Id: I2bada31881c5de54c3af6d47e3f6412358edc582 --- keystonemiddleware/auth_token.py | 2 +- .../tests/test_auth_token_middleware.py | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py index 974e5906..785f47ac 100644 --- a/keystonemiddleware/auth_token.py +++ b/keystonemiddleware/auth_token.py @@ -195,7 +195,7 @@ import six from six.moves import urllib from keystonemiddleware import _memcache_crypt as memcache_crypt -from keystonemiddleware.i18n import _, _LE, _LI, _LW +from keystonemiddleware.i18n import _, _LC, _LE, _LI, _LW from keystonemiddleware.openstack.common import memorycache diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py index af8db290..658428cd 100644 --- a/keystonemiddleware/tests/test_auth_token_middleware.py +++ b/keystonemiddleware/tests/test_auth_token_middleware.py @@ -2405,6 +2405,26 @@ class v3CompositeAuthTests(BaseAuthTokenMiddlewareTest, return response +class OtherTests(BaseAuthTokenMiddlewareTest): + + def setUp(self): + super(OtherTests, self).setUp() + self.logger = self.useFixture(fixtures.FakeLogger()) + + def test_unknown_server_versions(self): + versions = fixture.DiscoveryList(v2=False, v3_id='v4', href=BASE_URI) + self.set_middleware() + + self.requests.get(BASE_URI, json=versions, status_code=300) + + req = webob.Request.blank('/') + req.headers['X-Auth-Token'] = uuid.uuid4().hex + self.middleware(req.environ, self.start_fake_response) + self.assertEqual(503, self.response_status) + + self.assertIn('versions [v3.0, v2.0]', self.logger.output) + + class DefaultAuthPluginTests(testtools.TestCase): def new_plugin(self, auth_host=None, auth_port=None, auth_protocol=None,