From a61cbab3d1b8bcd5975e78710a14f90d1033380b Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 17 May 2012 11:02:54 -0400 Subject: [PATCH] Make tests work by default, without having to create any extra directories --- envs/test.py | 5 +++-- {test_data => test_root/data}/course_settings.py | 0 {test_data => test_root/data}/custom_tags/.git-keep | 0 test_root/log/.git-keep | 0 4 files changed, 3 insertions(+), 2 deletions(-) rename {test_data => test_root/data}/course_settings.py (100%) rename {test_data => test_root/data}/custom_tags/.git-keep (100%) create mode 100644 test_root/log/.git-keep diff --git a/envs/test.py b/envs/test.py index 9aa030c15a..80d5deeeb3 100644 --- a/envs/test.py +++ b/envs/test.py @@ -25,7 +25,8 @@ for app in os.listdir(PROJECT_ROOT / 'djangoapps'): TEST_RUNNER = 'django_nose.NoseTestSuiteRunner' # Local Directories -COURSES_ROOT = PROJECT_ROOT / "test_data" +TEST_ROOT = path("test_root") +COURSES_ROOT = TEST_ROOT / "data" DATA_DIR = COURSES_ROOT MAKO_TEMPLATES['course'] = [DATA_DIR] MAKO_TEMPLATES['sections'] = [DATA_DIR / 'sections'] @@ -34,7 +35,7 @@ MAKO_TEMPLATES['main'] = [PROJECT_ROOT / 'templates', DATA_DIR / 'info', DATA_DIR / 'problems'] -LOGGING = logsettings.get_logger_config(PROJECT_ROOT / "log", +LOGGING = logsettings.get_logger_config(TEST_ROOT / "log", logging_env="dev", tracking_filename="tracking.log", debug=True) diff --git a/test_data/course_settings.py b/test_root/data/course_settings.py similarity index 100% rename from test_data/course_settings.py rename to test_root/data/course_settings.py diff --git a/test_data/custom_tags/.git-keep b/test_root/data/custom_tags/.git-keep similarity index 100% rename from test_data/custom_tags/.git-keep rename to test_root/data/custom_tags/.git-keep diff --git a/test_root/log/.git-keep b/test_root/log/.git-keep new file mode 100644 index 0000000000..e69de29bb2