Remove custom string truth handling

Testing the delay_auth_decision for truth values is no longer necessary
as we do _conf_value_types_convert to convert paste string values into
those expected by the oslo.config options.

Change-Id: Ifa8be05830923a831a319bf291b7647ba0bbe781

2 files changed, 21 insertions, 4 deletions

diff --git a/keystonemiddleware/auth_token.py b/keystonemiddleware/auth_token.py
index 8f642d9..84c1d67 100644
--- a/keystonemiddleware/auth_token.py
+++ b/keystonemiddleware/auth_token.py
@@ -702,10 +702,7 @@ class AuthProtocol(object):
 
         # delay_auth_decision means we still allow unauthenticated requests
         # through and we let the downstream service make the final decision
-        self._delay_auth_decision = (self._conf_get('delay_auth_decision') in
-                                     (True, 'true', 't', '1', 'on', 'yes', 'y')
-                                     )
-
+        self._delay_auth_decision = self._conf_get('delay_auth_decision')
         self._include_service_catalog = self._conf_get(
             'include_service_catalog')
 
diff --git a/keystonemiddleware/tests/test_auth_token_middleware.py b/keystonemiddleware/tests/test_auth_token_middleware.py
index 20daf2a..a7273a1 100644
--- a/keystonemiddleware/tests/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/test_auth_token_middleware.py
@@ -2122,6 +2122,26 @@ class DelayedAuthTests(BaseAuthTokenMiddlewareTest):
         self.assertEqual("Keystone uri='%s'" % auth_uri,
                          self.response_headers['WWW-Authenticate'])
 
+    def test_delayed_auth_values(self):
+        fake_app = new_app('401 Unauthorized', uuid.uuid4().hex)
+        middleware = auth_token.AuthProtocol(fake_app,
+                                             {'auth_uri': 'http://local.test'})
+        self.assertFalse(middleware._delay_auth_decision)
+
+        for v in ('True', '1', 'on', 'yes'):
+            conf = {'delay_auth_decision': v,
+                    'auth_uri': 'http://local.test'}
+
+            middleware = auth_token.AuthProtocol(fake_app, conf)
+            self.assertTrue(middleware._delay_auth_decision)
+
+        for v in ('False', '0', 'no'):
+            conf = {'delay_auth_decision': v,
+                    'auth_uri': 'http://local.test'}
+
+            middleware = auth_token.AuthProtocol(fake_app, conf)
+            self.assertFalse(middleware._delay_auth_decision)
+
 
 class CommonCompositeAuthTests(object):
     """Test Composite authentication.