diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index 19eed98c31..1098d709db 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -351,13 +351,20 @@ CELERYBEAT_SCHEDULE = { }, } -# Use Redis as cache backend. -CACHES = { - 'default': { - 'BACKEND': 'redis_cache.RedisCache', - 'LOCATION': BROKER_URL, - }, -} +# Use Redis as cache backend (except when testing). +if is_testing(): + CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + }, + } +else: + CACHES = { + 'default': { + 'BACKEND': 'redis_cache.RedisCache', + 'LOCATION': BROKER_URL, + }, + } # Social Auth configuration. SOCIAL_AUTH_STRATEGY = 'social.strategies.django_strategy.DjangoStrategy' diff --git a/awx/settings/postprocess.py b/awx/settings/postprocess.py index 6cbeec051a..d63833aac8 100644 --- a/awx/settings/postprocess.py +++ b/awx/settings/postprocess.py @@ -34,4 +34,5 @@ if not AUTH_BASIC_ENABLED: REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] = [x for x in REST_FRAMEWORK['DEFAULT_AUTHENTICATION_CLASSES'] if x != 'rest_framework.authentication.BasicAuthentication'] # Update cache to use celery broker URL defined in configuration files. -CACHES['default']['LOCATION'] = BROKER_URL +if CACHES['default']['BACKEND'] == 'redis_cache.RedisCache': + CACHES['default']['LOCATION'] = BROKER_URL