Fix Django 1.11 Compatibility
Implements: blueprint dj111 Change-Id: Idfaef58b2a069006f6d792e43041dd136097c413 Co-Authored-By: Adrian Turjak <adriant@catalyst.net.nz>
This commit is contained in:
parent
a0af708a49
commit
601e1ad44c
|
@ -13,6 +13,8 @@
|
|||
|
||||
import os
|
||||
|
||||
ALLOWED_HOSTS = ['*']
|
||||
|
||||
DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
|
||||
|
||||
INSTALLED_APPS = [
|
||||
|
|
|
@ -1099,7 +1099,8 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
|
|||
url = reverse('login')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response, 'name="domain" type="text"')
|
||||
self.assertContains(response, 'id="id_domain"')
|
||||
self.assertContains(response, 'name="domain"')
|
||||
|
||||
def test_login_form_multidomain_dropdown(self):
|
||||
override = self.settings(OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT=True,
|
||||
|
@ -1113,7 +1114,8 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
|
|||
url = reverse('login')
|
||||
response = self.client.get(url)
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response, 'select id="id_domain" name="domain"')
|
||||
self.assertContains(response, 'id="id_domain"')
|
||||
self.assertContains(response, 'name="domain"')
|
||||
self.assertContains(response, 'option value="Default"')
|
||||
settings.OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = False
|
||||
|
||||
|
|
|
@ -17,7 +17,6 @@ import re
|
|||
|
||||
from django.conf import settings
|
||||
from django.contrib import auth
|
||||
from django.contrib.auth import middleware
|
||||
from django.contrib.auth import models
|
||||
from django.utils import timezone
|
||||
from keystoneauth1.identity import v2 as v2_auth
|
||||
|
@ -62,6 +61,10 @@ def get_user(request):
|
|||
|
||||
|
||||
def patch_middleware_get_user():
|
||||
# NOTE(adriant): We can't import middleware until our customer user model
|
||||
# is actually registered, otherwise a call to get_user_model within the
|
||||
# middleware module will fail.
|
||||
from django.contrib.auth import middleware
|
||||
middleware.get_user = middleware_get_user
|
||||
auth.get_user = get_user
|
||||
|
||||
|
|
Loading…
Reference in New Issue