Remove Diablo compatibility tests

We really don't care about Diablo compatibility any more. Clean up the
old cruft.

Change-Id: Ib1f628eb40ba0cb6334300cb6dca7dcdfcddba1b

2 files changed, 0 insertions, 62 deletions

diff --git a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
index 9ea8077..1e2dcc3 100644
--- a/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
+++ b/keystonemiddleware/tests/unit/auth_token/test_auth_token_middleware.py
@@ -55,9 +55,6 @@ EXPECTED_V2_DEFAULT_ENV_RESPONSE = {
     'HTTP_X_USER_NAME': 'user_name1',
     'HTTP_X_ROLES': 'role1,role2',
     'HTTP_X_IS_ADMIN_PROJECT': 'True',
-    'HTTP_X_USER': 'user_name1',  # deprecated (diablo-compat)
-    'HTTP_X_TENANT': 'tenant_name1',  # deprecated (diablo-compat)
-    'HTTP_X_ROLE': 'role1,role2',  # deprecated (diablo-compat)
 }
 
 EXPECTED_V2_DEFAULT_SERVICE_ENV_RESPONSE = {
@@ -348,44 +345,6 @@ class BaseAuthTokenMiddlewareTest(base.BaseAuthTokenTestCase):
             self.assertIsNone(self.requests_mock.last_request)
 
 
-class DiabloAuthTokenMiddlewareTest(BaseAuthTokenMiddlewareTest,
-                                    testresources.ResourcedTestCase):
-
-    resources = [('examples', client_fixtures.EXAMPLES_RESOURCE)]
-
-    """Auth Token middleware should understand Diablo keystone responses."""
-    def setUp(self):
-        # pre-diablo only had Tenant ID, which was also the Name
-        expected_env = {
-            'HTTP_X_TENANT_ID': 'tenant_id1',
-            'HTTP_X_TENANT_NAME': 'tenant_id1',
-            # now deprecated (diablo-compat)
-            'HTTP_X_TENANT': 'tenant_id1',
-        }
-
-        super(DiabloAuthTokenMiddlewareTest, self).setUp(
-            expected_env=expected_env)
-
-        self.requests_mock.get(BASE_URI,
-                               json=VERSION_LIST_v2,
-                               status_code=300)
-
-        self.requests_mock.post("%s/v2.0/tokens" % BASE_URI,
-                                text=FAKE_ADMIN_TOKEN)
-
-        self.token_id = self.examples.VALID_DIABLO_TOKEN
-        token_response = self.examples.JSON_TOKEN_RESPONSES[self.token_id]
-
-        url = "%s/v2.0/tokens/%s" % (BASE_URI, self.token_id)
-        self.requests_mock.get(url, text=token_response)
-
-        self.set_middleware()
-
-    def test_valid_diablo_response(self):
-        resp = self.call_middleware(headers={'X-Auth-Token': self.token_id})
-        self.assertIn('keystone.token_info', resp.request.environ)
-
-
 class CachePoolTest(BaseAuthTokenMiddlewareTest):
     def test_use_cache_from_env(self):
         # If `swift.cache` is set in the environment and `cache` is set in the
diff --git a/keystonemiddleware/tests/unit/client_fixtures.py b/keystonemiddleware/tests/unit/client_fixtures.py
index 9f56804..fae3e07 100644
--- a/keystonemiddleware/tests/unit/client_fixtures.py
+++ b/keystonemiddleware/tests/unit/client_fixtures.py
@@ -108,7 +108,6 @@ class Examples(fixtures.Fixture):
         self.UUID_TOKEN_UNSCOPED = '731f903721c14827be7b2dc912af7776'
         self.UUID_TOKEN_BIND = '3fc54048ad64405c98225ce0897af7c5'
         self.UUID_TOKEN_UNKNOWN_BIND = '8885fdf4d42e4fb9879e6379fa1eaf48'
-        self.VALID_DIABLO_TOKEN = 'b0cf19b55dbb4f20a6ee18e6c6cf1726'
         self.v3_UUID_TOKEN_DEFAULT = '5603457654b346fdbb93437bfe76f2f1'
         self.v3_UUID_TOKEN_UNSCOPED = 'd34835fdaec447e695a0a024d84f8d79'
         self.v3_UUID_TOKEN_DOMAIN_SCOPED = 'e8a7b63aaa4449f38f0c5c05c3581792'
@@ -199,26 +198,6 @@ class Examples(fixtures.Fixture):
         self.UNVERSIONED_SERVICE_URL = 'https://keystone.example.com:1234/'
         self.SERVICE_URL = self.UNVERSIONED_SERVICE_URL + 'v2.0'
 
-        # Old Tokens
-
-        self.TOKEN_RESPONSES[self.VALID_DIABLO_TOKEN] = {
-            'access': {
-                'token': {
-                    'id': self.VALID_DIABLO_TOKEN,
-                    'expires': '2020-01-01T00:00:10.000123Z',
-                    'tenantId': PROJECT_ID,
-                },
-                'user': {
-                    'id': USER_ID,
-                    'name': USER_NAME,
-                    'roles': [
-                        {'name': ROLE_NAME1},
-                        {'name': ROLE_NAME2},
-                    ],
-                },
-            },
-        }
-
         # Generated V2 Tokens
 
         token = fixture.V2Token(token_id=self.UUID_TOKEN_DEFAULT,