Merge branch 'master' of https://github.com/Adarnof/allianceauth into custom_user

# Conflicts:
#	alliance_auth/settings.py.example
#	eveonline/views.py

Fix some tests.
This commit is contained in:
Adarnof
2017-05-27 18:34:59 -04:00
parent 971ce294ad
commit 00cc89d71c
17 changed files with 158 additions and 223 deletions

View File

@@ -16,8 +16,7 @@ from services.tasks import validate_services
class ServicesTasksTestCase(TestCase):
def setUp(self):
self.member = AuthUtils.create_member('auth_member')
self.none_user = AuthUtils.create_user('none_user', disconnect_signals=True)
self.member = AuthUtils.create_user('auth_member')
@mock.patch('services.tasks.ServicesHook')
def test_validate_services(self, services_hook):