openstack
/
django_openstack_auth
Code Issues Proposed changes

Merge "Fix Django 1.11 Compatibility"

This commit is contained in:
Jenkins 2017-07-18 15:06:39 +00:00 committed by Gerrit Code Review
parent 33524c8d2c 601e1ad44c
commit fb76589a26
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_auth/tests/settings.py
View File

@ -13,6 +13,8 @@
import os import os
ALLOWED_HOSTS = ['*']
DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}} DATABASES = {'default': {'ENGINE': 'django.db.backends.sqlite3'}}
INSTALLED_APPS = [ INSTALLED_APPS = [

6
openstack_auth/tests/tests.py
View File

@ -1099,7 +1099,8 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
url = reverse('login') url = reverse('login')
response = self.client.get(url) response = self.client.get(url)
self.assertEqual(response.status_code, 200) 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): def test_login_form_multidomain_dropdown(self):
override = self.settings(OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT=True, override = self.settings(OPENSTACK_KEYSTONE_MULTIDOMAIN_SUPPORT=True,
@ -1113,7 +1114,8 @@ class OpenStackAuthTestsV3(OpenStackAuthTestsMixin,
url = reverse('login') url = reverse('login')
response = self.client.get(url) response = self.client.get(url)
self.assertEqual(response.status_code, 200) 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"') self.assertContains(response, 'option value="Default"')
settings.OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = False settings.OPENSTACK_KEYSTONE_DOMAIN_DROPDOWN = False

5
openstack_auth/utils.py
View File

@ -17,7 +17,6 @@ import re
from django.conf import settings from django.conf import settings
from django.contrib import auth from django.contrib import auth
from django.contrib.auth import middleware
from django.contrib.auth import models from django.contrib.auth import models
from django.utils import timezone from django.utils import timezone
from keystoneauth1.identity import v2 as v2_auth from keystoneauth1.identity import v2 as v2_auth
@ -62,6 +61,10 @@ def get_user(request):
def patch_middleware_get_user(): 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 middleware.get_user = middleware_get_user
auth.get_user = get_user auth.get_user = get_user