From 4f34029b435fdcd8d02399f610f76070d35cb53d Mon Sep 17 00:00:00 2001 From: Ben Patterson Date: Fri, 25 Jul 2014 20:17:23 -0400 Subject: [PATCH] Simplify acceptance test env settings for pipeline handlers. It will now inherit from common settings. --- cms/envs/acceptance.py | 6 ------ lms/envs/acceptance.py | 6 ------ 2 files changed, 12 deletions(-) diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 4c94d7b77f..e1b19d626d 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -78,12 +78,6 @@ DATABASES = { } } -# Enable asset pipeline -# Our fork of django-pipeline uses `PIPELINE` instead of `PIPELINE_ENABLED` -# PipelineFinder is explained here: http://django-pipeline.readthedocs.org/en/1.1.24/storages.html -PIPELINE = True -STATICFILES_FINDERS += ('pipeline.finders.PipelineFinder', ) - # Use the auto_auth workflow for creating users and logging them in FEATURES['AUTOMATIC_AUTH_FOR_TESTING'] = True diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 96842e8549..7e96d5b2df 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -87,12 +87,6 @@ EVENT_TRACKING_BACKENDS.update({ }) -# Enable asset pipeline -# Our fork of django-pipeline uses `PIPELINE` instead of `PIPELINE_ENABLED` -# PipelineFinder is explained here: http://django-pipeline.readthedocs.org/en/1.1.24/storages.html -PIPELINE = True -STATICFILES_FINDERS += ('pipeline.finders.PipelineFinder', ) - BULK_EMAIL_DEFAULT_FROM_EMAIL = "test@test.org" # Forums are disabled in test.py to speed up unit tests, but we do not have