From 5e6ad813ccf6eaeb563dda157403a91c6cede3b0 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Mon, 3 Mar 2014 13:28:54 +1000
Subject: [PATCH] Tests should use identity_uri by default

auth_token middleware tests should use the identity_uri variable by
default now that we have deprecated the auth fragments.

Blueprint: identity-uri
Change-Id: I897939498b411086d06b3ed16060cbc0e482e519
---
 .../tests/test_auth_token_middleware.py       | 28 +++++++++++--------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/keystoneclient/tests/test_auth_token_middleware.py b/keystoneclient/tests/test_auth_token_middleware.py
index 54394bac1..718f962bf 100644
--- a/keystoneclient/tests/test_auth_token_middleware.py
+++ b/keystoneclient/tests/test_auth_token_middleware.py
@@ -265,10 +265,7 @@ class BaseAuthTokenMiddlewareTest(testtools.TestCase):
         self.middleware = None
 
         self.conf = {
-            'auth_host': 'keystone.example.com',
-            'auth_port': 1234,
-            'auth_protocol': 'https',
-            'auth_admin_prefix': '/testadmin',
+            'identity_uri': 'https://keystone.example.com:1234/testadmin/',
             'signing_dir': client_fixtures.CERTDIR,
             'auth_version': auth_version,
             'auth_uri': 'https://keystone.example.com:1234',
@@ -498,6 +495,7 @@ class CommonAuthTokenMiddlewareTest(object):
         self.assertLastPath(None)
 
     def test_init_by_ipv6Addr_auth_host(self):
+        del self.conf['identity_uri']
         conf = {
             'auth_host': '2001:2013:1:f101::1',
             'auth_port': 1234,
@@ -524,12 +522,12 @@ class CommonAuthTokenMiddlewareTest(object):
         self.assert_valid_request_200(self.token_dict['uuid_token_default'])
         self.assert_valid_last_url(self.token_dict['uuid_token_default'])
 
-    def test_valid_uuid_request_with_identity_uri(self):
-        for opt in ['auth_host', 'auth_port', 'auth_protocol',
-                    'auth_admin_prefix']:
-            del self.conf[opt]
-        self.conf['identity_uri'] = \
-            'https://keystone.example.com:1234/testadmin/'
+    def test_valid_uuid_request_with_auth_fragments(self):
+        del self.conf['identity_uri']
+        self.conf['auth_protocol'] = 'https'
+        self.conf['auth_host'] = 'keystone.example.com'
+        self.conf['auth_port'] = 1234
+        self.conf['auth_admin_prefix'] = '/testadmin'
         self.set_middleware()
         self.assert_valid_request_200(self.token_dict['uuid_token_default'])
         self.assert_valid_last_url(self.token_dict['uuid_token_default'])
@@ -537,8 +535,6 @@ class CommonAuthTokenMiddlewareTest(object):
     def test_valid_signed_request(self):
         self.assert_valid_request_200(
             self.token_dict['signed_token_scoped'])
-        self.assertEqual(self.middleware.conf['auth_admin_prefix'],
-                         "/testadmin")
         #ensure that signed requests do not generate HTTP traffic
         self.assertLastPath(None)
 
@@ -1198,6 +1194,10 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
                          httpretty.last_request().path)
 
     def test_prefix_trailing_slash(self):
+        del self.conf['identity_uri']
+        self.conf['auth_protocol'] = 'https'
+        self.conf['auth_host'] = 'keystone.example.com'
+        self.conf['auth_port'] = 1234
         self.conf['auth_admin_prefix'] = '/newadmin/'
 
         httpretty.register_uri(httpretty.GET,
@@ -1220,6 +1220,10 @@ class CertDownloadMiddlewareTest(BaseAuthTokenMiddlewareTest,
                          httpretty.last_request().path)
 
     def test_without_prefix(self):
+        del self.conf['identity_uri']
+        self.conf['auth_protocol'] = 'https'
+        self.conf['auth_host'] = 'keystone.example.com'
+        self.conf['auth_port'] = 1234
         self.conf['auth_admin_prefix'] = ''
 
         httpretty.register_uri(httpretty.GET,