From ccc7412947bbd0a5df5a9eddb4eaab581fb517bd Mon Sep 17 00:00:00 2001 From: Adarnof Date: Sat, 27 May 2017 17:02:59 -0400 Subject: [PATCH] Update test settings --- alliance_auth/settings.py.example | 13 +++++++++++-- alliance_auth/tests/test_settings.py | 23 +++++------------------ 2 files changed, 16 insertions(+), 20 deletions(-) diff --git a/alliance_auth/settings.py.example b/alliance_auth/settings.py.example index 2a953ea2..40062e2d 100644 --- a/alliance_auth/settings.py.example +++ b/alliance_auth/settings.py.example @@ -73,7 +73,16 @@ djcelery.setup_loader() # Celery configuration BROKER_URL = 'redis://localhost:6379/0' CELERYBEAT_SCHEDULER = "djcelery.schedulers.DatabaseScheduler" -CELERYBEAT_SCHEDULE = dict() +CELERYBEAT_SCHEDULE = { + 'esi_cleanup_callbackredirect': { + 'task': 'esi.tasks.cleanup_callbackredirect', + 'schedule': crontab(hour='*/4'), + }, + 'esi_cleanup_token': { + 'task': 'esi.tasks.cleanup_token', + 'schedule': crontab(day_of_month='*/1'), + }, +} # Build paths inside the project like this: os.path.join(BASE_DIR, ...) BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__))) @@ -150,7 +159,7 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] -AUTHENTICATION_BACKENDS = ['authentication.backends.StateBackend', 'authentication.backends.ModelBackend'] +AUTHENTICATION_BACKENDS = ['authentication.backends.StateBackend'] LOGIN_URL = 'auth_login_user' # Internationalization diff --git a/alliance_auth/tests/test_settings.py b/alliance_auth/tests/test_settings.py index d4720472..c8163096 100644 --- a/alliance_auth/tests/test_settings.py +++ b/alliance_auth/tests/test_settings.py @@ -94,7 +94,7 @@ LANGUAGES = ( ('en', ugettext('English')), ('de', ugettext('German')), ) - +LOGIN_TOKEN_SCOPES = ['esi-characters.read_opportunities.v1'] TEMPLATES = [ { 'BACKEND': 'django.template.backends.django.DjangoTemplates', @@ -115,8 +115,6 @@ TEMPLATES = [ 'django.template.context_processors.tz', 'services.context_processors.auth_settings', 'notifications.context_processors.user_notification_count', - 'authentication.context_processors.states', - 'authentication.context_processors.membership_state', 'groupmanagement.context_processors.can_manage_groups', ], }, @@ -174,6 +172,8 @@ CACHES = { } } +AUTHENTICATION_BACKENDS = ['authentication.backends.StateBackend'] + ##################################################### ## ## Auth configuration starts here @@ -219,6 +219,8 @@ EXTERNAL_MEDIA_URL = os.environ.get('AA_EXTERNAL_MEDIA_URL', '') FORUM_URL = os.environ.get('AA_FORUM_URL', '') SITE_NAME = os.environ.get('AA_SITE_NAME', 'Test Alliance Auth') +PHPBB3_URL = FORUM_URL + ################### # SSO Settings ################### @@ -232,21 +234,6 @@ ESI_SSO_CLIENT_ID = os.environ.get('AA_ESI_SSO_CLIENT_ID', '') ESI_SSO_CLIENT_SECRET = os.environ.get('AA_ESI_SSO_CLIENT_SECRET', '') ESI_SSO_CALLBACK_URL = os.environ.get('AA_ESI_SSO_CALLBACK_URL', '') -######################### -# Default Group Settings -######################### -# DEFAULT_AUTH_GROUP - Default group members are put in -# DEFAULT_BLUE_GROUP - Default group for blue members -# MEMBER_CORP_GROUPS - Assign members to a group representing their main corp -# BLUE_CORP_GROUPS - Assign blues to a group representing their main corp -######################### -DEFAULT_AUTH_GROUP = os.environ.get('AA_DEFAULT_ALLIANCE_GROUP', 'Member') -DEFAULT_BLUE_GROUP = os.environ.get('AA_DEFAULT_BLUE_GROUP', 'Blue') -MEMBER_CORP_GROUPS = 'True' == os.environ.get('AA_MEMBER_CORP_GROUPS', 'True') -MEMBER_ALLIANCE_GROUPS = 'True' == os.environ.get('AA_MEMBER_ALLIANCE_GROUPS', 'False') -BLUE_CORP_GROUPS = 'True' == os.environ.get('AA_BLUE_CORP_GROUPS', 'False') -BLUE_ALLIANCE_GROUPS = 'True' == os.environ.get('AA_BLUE_ALLIANCE_GROUPS', 'False') - ######################### # Corp Configuration #########################