From fc16b3fedfeea88e1117d26737c0b3f83a70f822 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Sat, 6 Oct 2018 17:18:40 +0200 Subject: [PATCH 1/2] Fix non py3-compatible test in CI --- allauth_ens/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/allauth_ens/tests.py b/allauth_ens/tests.py index f8bf5c0..002a8f3 100644 --- a/allauth_ens/tests.py +++ b/allauth_ens/tests.py @@ -375,4 +375,4 @@ class LongTermClipperTests(CASTestCase): for uid in uids: with self.assertRaises(ValueError) as cm: get_ldap_infos(uid) - self.assertIn(uid, cm.exception.message) + self.assertIn(uid, str(cm.exception)) From a27921016bcb7b2ce8cd136a2b23d586d531a3dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20P=C3=A9pin?= Date: Sat, 6 Oct 2018 22:57:49 +0200 Subject: [PATCH 2/2] fix import ordering --- allauth_ens/tests.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/allauth_ens/tests.py b/allauth_ens/tests.py index 002a8f3..a35ca3b 100644 --- a/allauth_ens/tests.py +++ b/allauth_ens/tests.py @@ -9,13 +9,14 @@ from django.core import mail from django.test import TestCase, override_settings from allauth.socialaccount.models import SocialAccount -from allauth_ens.utils import get_ldap_infos import six from allauth_cas.test.testcases import CASTestCase from fakeldap import MockLDAP from mock import patch +from allauth_ens.utils import get_ldap_infos + from .adapter import deprecate_clippers, install_longterm_adapter _mock_ldap = MockLDAP()