From 41e3ffc216c1de6d3380845ee7e3ca9c93a8745f Mon Sep 17 00:00:00 2001 From: Jay Zoldak Date: Wed, 4 Sep 2013 09:28:30 -0400 Subject: [PATCH] Enable developer local overrides to acceptance settings --- cms/envs/acceptance.py | 7 +++++++ lms/envs/acceptance.py | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/cms/envs/acceptance.py b/cms/envs/acceptance.py index 3b89e2e988..6c32592589 100644 --- a/cms/envs/acceptance.py +++ b/cms/envs/acceptance.py @@ -86,3 +86,10 @@ INSTALLED_APPS += ('lettuce.django',) LETTUCE_APPS = ('contentstore',) LETTUCE_SERVER_PORT = choice(PORTS) if SAUCE.get('SAUCE_ENABLED') else randint(1024, 65535) LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome') + +##################################################################### +# Lastly, see if the developer has any local overrides. +try: + from .private import * # pylint: disable=F0401 +except ImportError: + pass diff --git a/lms/envs/acceptance.py b/lms/envs/acceptance.py index 34112566ee..6a63653528 100644 --- a/lms/envs/acceptance.py +++ b/lms/envs/acceptance.py @@ -114,3 +114,10 @@ INSTALLED_APPS += ('lettuce.django',) LETTUCE_APPS = ('courseware',) LETTUCE_SERVER_PORT = choice(PORTS) if SAUCE.get('SAUCE_ENABLED') else randint(1024, 65535) LETTUCE_BROWSER = os.environ.get('LETTUCE_BROWSER', 'chrome') + +##################################################################### +# Lastly, see if the developer has any local overrides. +try: + from .private import * # pylint: disable=F0401 +except ImportError: + pass