diff --git a/testproject/settings.py b/testproject/settings.py index 57390ef..4a51dce 100644 --- a/testproject/settings.py +++ b/testproject/settings.py @@ -53,8 +53,6 @@ TEST_RUNNER='djangosanetesting.testrunner.DstNoseTestSuiteRunner TEST_DATABASE_CHARSET="utf8" -CHERRYPY_TEST_SERVER = True - LANGUAGE_CODE = 'cs' CACHE_BACKEND = 'locmem://' @@ -64,5 +62,11 @@ NONSENSICAL_SETTING_ATTRIBUTE_FOR_MOCK_TESTING = "owned" DEBUG = True +try: + import cherrypy + CHERRYPY_TEST_SERVER = True +except ImportError: + CHERRYPY_TEST_SERVER = False + from config import *