ynerant/django-cas-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some python3 compat and change in test client behaviour in django 1.9

Browse Source
This commit is contained in:
Valentin Samir 2016-06-28 00:10:36 +02:00
parent bab79c4de5
commit fc57288c30
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
cas_server/tests.py
View File

@ -1,5 +1,6 @@
from .default_settings import settings from .default_settings import settings
import django
from django.test import TestCase from django.test import TestCase
from django.test import Client from django.test import Client
@ -333,8 +334,8 @@ class LoginTestCase(TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue( self.assertTrue(
( (
"Authentication required by service " b"Authentication required by service "
"example (https://www.example.com)" b"example (https://www.example.com)"
) in response.content ) in response.content
) )
@ -343,7 +344,7 @@ class LoginTestCase(TestCase):
client = Client() client = Client()
response = client.get("/login?service=https://www.example.net") response = client.get("/login?service=https://www.example.net")
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue("Service https://www.example.net non allowed" in response.content) self.assertTrue(b"Service https://www.example.net non allowed" in response.content)
def test_view_login_get_auth_allowed_service(self): def test_view_login_get_auth_allowed_service(self):
"""Request a ticket for an allowed service by an authenticated client""" """Request a ticket for an allowed service by an authenticated client"""
@ -360,8 +361,8 @@ class LoginTestCase(TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue( self.assertTrue(
( (
"Authentication has been required by service " b"Authentication has been required by service "
"example (https://www.example.com)" b"example (https://www.example.com)"
) in response.content ) in response.content
) )
@ -386,6 +387,9 @@ class LoginTestCase(TestCase):
response = client.get("/login") response = client.get("/login")
self.assert_login_failed(client, response, code=302) self.assert_login_failed(client, response, code=302)
if django.VERSION < (1, 9):
self.assertEqual(response["Location"], "http://testserver/login")
else:
self.assertEqual(response["Location"], "/login?") self.assertEqual(response["Location"], "/login?")
def test_service_restrict_user(self): def test_service_restrict_user(self):
@ -394,7 +398,7 @@ class LoginTestCase(TestCase):
client = get_auth_client() client = get_auth_client()
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue("Username non allowed" in response.content) self.assertTrue(b"Username non allowed" in response.content)
service = "https://restrict_user_success.example.com" service = "https://restrict_user_success.example.com"
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
@ -407,7 +411,7 @@ class LoginTestCase(TestCase):
client = get_auth_client() client = get_auth_client()
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue("User charateristics non allowed" in response.content) self.assertTrue(b"User charateristics non allowed" in response.content)
service = "https://filter_success.example.com" service = "https://filter_success.example.com"
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
@ -420,7 +424,7 @@ class LoginTestCase(TestCase):
client = get_auth_client() client = get_auth_client()
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertTrue("The attribut uid is needed to use that service" in response.content) self.assertTrue(b"The attribut uid is needed to use that service" in response.content)
service = "https://field_needed_success.example.com" service = "https://field_needed_success.example.com"
response = client.get("/login", {'service': service}) response = client.get("/login", {'service': service})
@ -689,8 +693,8 @@ class ValidateServiceTestCase(TestCase):
original = set() original = set()
for key, value in settings.CAS_TEST_ATTRIBUTES.items(): for key, value in settings.CAS_TEST_ATTRIBUTES.items():
if isinstance(value, list): if isinstance(value, list):
for v in value: for sub_value in value:
original.add((key, v)) original.add((key, sub_value))
else: else:
original.add((key, value)) original.add((key, value))
self.assertEqual(attrs1, attrs2) self.assertEqual(attrs1, attrs2)
@ -865,8 +869,8 @@ class ProxyTestCase(TestCase):
original = set() original = set()
for key, value in settings.CAS_TEST_ATTRIBUTES.items(): for key, value in settings.CAS_TEST_ATTRIBUTES.items():
if isinstance(value, list): if isinstance(value, list):
for v in value: for sub_value in value:
original.add((key, v)) original.add((key, sub_value))
else: else:
original.add((key, value)) original.add((key, value))
self.assertEqual(attrs1, attrs2) self.assertEqual(attrs1, attrs2)