From 41d7a9a907881f52f27ad5f743707a27e8574366 Mon Sep 17 00:00:00 2001 From: Florian Apolloner Date: Tue, 26 Feb 2013 09:51:56 +0100 Subject: [PATCH] Moved test_templates to templates to prevent issues with regressiontests/templates later on. --- tests/runtests.py | 4 ++-- tests/{templates => test_templates}/base.html | 0 .../comments/comment_notification_email.txt | 0 .../{templates => test_templates}/custom_admin/add_form.html | 0 .../custom_admin/change_form.html | 0 .../custom_admin/change_list.html | 0 .../custom_admin/delete_confirmation.html | 0 .../custom_admin/delete_selected_confirmation.html | 0 tests/{templates => test_templates}/custom_admin/index.html | 0 tests/{templates => test_templates}/custom_admin/login.html | 0 tests/{templates => test_templates}/custom_admin/logout.html | 0 .../custom_admin/object_history.html | 0 .../custom_admin/password_change_done.html | 0 .../custom_admin/password_change_form.html | 0 tests/{templates => test_templates}/extended.html | 0 tests/{templates => test_templates}/form_view.html | 0 tests/{templates => test_templates}/login.html | 0 .../views/article_archive_day.html | 0 .../views/article_archive_month.html | 0 .../views/article_confirm_delete.html | 0 tests/{templates => test_templates}/views/article_detail.html | 0 tests/{templates => test_templates}/views/article_form.html | 0 tests/{templates => test_templates}/views/article_list.html | 0 .../views/datearticle_archive_month.html | 0 .../views/urlarticle_detail.html | 0 .../{templates => test_templates}/views/urlarticle_form.html | 0 26 files changed, 2 insertions(+), 2 deletions(-) rename tests/{templates => test_templates}/base.html (100%) rename tests/{templates => test_templates}/comments/comment_notification_email.txt (100%) rename tests/{templates => test_templates}/custom_admin/add_form.html (100%) rename tests/{templates => test_templates}/custom_admin/change_form.html (100%) rename tests/{templates => test_templates}/custom_admin/change_list.html (100%) rename tests/{templates => test_templates}/custom_admin/delete_confirmation.html (100%) rename tests/{templates => test_templates}/custom_admin/delete_selected_confirmation.html (100%) rename tests/{templates => test_templates}/custom_admin/index.html (100%) rename tests/{templates => test_templates}/custom_admin/login.html (100%) rename tests/{templates => test_templates}/custom_admin/logout.html (100%) rename tests/{templates => test_templates}/custom_admin/object_history.html (100%) rename tests/{templates => test_templates}/custom_admin/password_change_done.html (100%) rename tests/{templates => test_templates}/custom_admin/password_change_form.html (100%) rename tests/{templates => test_templates}/extended.html (100%) rename tests/{templates => test_templates}/form_view.html (100%) rename tests/{templates => test_templates}/login.html (100%) rename tests/{templates => test_templates}/views/article_archive_day.html (100%) rename tests/{templates => test_templates}/views/article_archive_month.html (100%) rename tests/{templates => test_templates}/views/article_confirm_delete.html (100%) rename tests/{templates => test_templates}/views/article_detail.html (100%) rename tests/{templates => test_templates}/views/article_form.html (100%) rename tests/{templates => test_templates}/views/article_list.html (100%) rename tests/{templates => test_templates}/views/datearticle_archive_month.html (100%) rename tests/{templates => test_templates}/views/urlarticle_detail.html (100%) rename tests/{templates => test_templates}/views/urlarticle_form.html (100%) diff --git a/tests/runtests.py b/tests/runtests.py index 800a3f0b93..5eb8d0cb3d 100755 --- a/tests/runtests.py +++ b/tests/runtests.py @@ -22,7 +22,7 @@ REGRESSION_TEST_DIR = os.path.join(RUNTESTS_DIR, REGRESSION_TESTS_DIR_NAME) TEMP_DIR = tempfile.mkdtemp(prefix='django_') os.environ['DJANGO_TEST_TEMP_DIR'] = TEMP_DIR -REGRESSION_SUBDIRS_TO_SKIP = [] +SUBDIRS_TO_SKIP = ['test_templates'] ALWAYS_INSTALLED_APPS = [ 'django.contrib.contenttypes', @@ -60,7 +60,7 @@ def get_test_modules(): # Python 3 byte code dirs (PEP 3147) f == '__pycache__' or f.startswith('sql') or - os.path.basename(f) in REGRESSION_SUBDIRS_TO_SKIP): + os.path.basename(f) in SUBDIRS_TO_SKIP): continue modules.append((loc, f)) return modules diff --git a/tests/templates/base.html b/tests/test_templates/base.html similarity index 100% rename from tests/templates/base.html rename to tests/test_templates/base.html diff --git a/tests/templates/comments/comment_notification_email.txt b/tests/test_templates/comments/comment_notification_email.txt similarity index 100% rename from tests/templates/comments/comment_notification_email.txt rename to tests/test_templates/comments/comment_notification_email.txt diff --git a/tests/templates/custom_admin/add_form.html b/tests/test_templates/custom_admin/add_form.html similarity index 100% rename from tests/templates/custom_admin/add_form.html rename to tests/test_templates/custom_admin/add_form.html diff --git a/tests/templates/custom_admin/change_form.html b/tests/test_templates/custom_admin/change_form.html similarity index 100% rename from tests/templates/custom_admin/change_form.html rename to tests/test_templates/custom_admin/change_form.html diff --git a/tests/templates/custom_admin/change_list.html b/tests/test_templates/custom_admin/change_list.html similarity index 100% rename from tests/templates/custom_admin/change_list.html rename to tests/test_templates/custom_admin/change_list.html diff --git a/tests/templates/custom_admin/delete_confirmation.html b/tests/test_templates/custom_admin/delete_confirmation.html similarity index 100% rename from tests/templates/custom_admin/delete_confirmation.html rename to tests/test_templates/custom_admin/delete_confirmation.html diff --git a/tests/templates/custom_admin/delete_selected_confirmation.html b/tests/test_templates/custom_admin/delete_selected_confirmation.html similarity index 100% rename from tests/templates/custom_admin/delete_selected_confirmation.html rename to tests/test_templates/custom_admin/delete_selected_confirmation.html diff --git a/tests/templates/custom_admin/index.html b/tests/test_templates/custom_admin/index.html similarity index 100% rename from tests/templates/custom_admin/index.html rename to tests/test_templates/custom_admin/index.html diff --git a/tests/templates/custom_admin/login.html b/tests/test_templates/custom_admin/login.html similarity index 100% rename from tests/templates/custom_admin/login.html rename to tests/test_templates/custom_admin/login.html diff --git a/tests/templates/custom_admin/logout.html b/tests/test_templates/custom_admin/logout.html similarity index 100% rename from tests/templates/custom_admin/logout.html rename to tests/test_templates/custom_admin/logout.html diff --git a/tests/templates/custom_admin/object_history.html b/tests/test_templates/custom_admin/object_history.html similarity index 100% rename from tests/templates/custom_admin/object_history.html rename to tests/test_templates/custom_admin/object_history.html diff --git a/tests/templates/custom_admin/password_change_done.html b/tests/test_templates/custom_admin/password_change_done.html similarity index 100% rename from tests/templates/custom_admin/password_change_done.html rename to tests/test_templates/custom_admin/password_change_done.html diff --git a/tests/templates/custom_admin/password_change_form.html b/tests/test_templates/custom_admin/password_change_form.html similarity index 100% rename from tests/templates/custom_admin/password_change_form.html rename to tests/test_templates/custom_admin/password_change_form.html diff --git a/tests/templates/extended.html b/tests/test_templates/extended.html similarity index 100% rename from tests/templates/extended.html rename to tests/test_templates/extended.html diff --git a/tests/templates/form_view.html b/tests/test_templates/form_view.html similarity index 100% rename from tests/templates/form_view.html rename to tests/test_templates/form_view.html diff --git a/tests/templates/login.html b/tests/test_templates/login.html similarity index 100% rename from tests/templates/login.html rename to tests/test_templates/login.html diff --git a/tests/templates/views/article_archive_day.html b/tests/test_templates/views/article_archive_day.html similarity index 100% rename from tests/templates/views/article_archive_day.html rename to tests/test_templates/views/article_archive_day.html diff --git a/tests/templates/views/article_archive_month.html b/tests/test_templates/views/article_archive_month.html similarity index 100% rename from tests/templates/views/article_archive_month.html rename to tests/test_templates/views/article_archive_month.html diff --git a/tests/templates/views/article_confirm_delete.html b/tests/test_templates/views/article_confirm_delete.html similarity index 100% rename from tests/templates/views/article_confirm_delete.html rename to tests/test_templates/views/article_confirm_delete.html diff --git a/tests/templates/views/article_detail.html b/tests/test_templates/views/article_detail.html similarity index 100% rename from tests/templates/views/article_detail.html rename to tests/test_templates/views/article_detail.html diff --git a/tests/templates/views/article_form.html b/tests/test_templates/views/article_form.html similarity index 100% rename from tests/templates/views/article_form.html rename to tests/test_templates/views/article_form.html diff --git a/tests/templates/views/article_list.html b/tests/test_templates/views/article_list.html similarity index 100% rename from tests/templates/views/article_list.html rename to tests/test_templates/views/article_list.html diff --git a/tests/templates/views/datearticle_archive_month.html b/tests/test_templates/views/datearticle_archive_month.html similarity index 100% rename from tests/templates/views/datearticle_archive_month.html rename to tests/test_templates/views/datearticle_archive_month.html diff --git a/tests/templates/views/urlarticle_detail.html b/tests/test_templates/views/urlarticle_detail.html similarity index 100% rename from tests/templates/views/urlarticle_detail.html rename to tests/test_templates/views/urlarticle_detail.html diff --git a/tests/templates/views/urlarticle_form.html b/tests/test_templates/views/urlarticle_form.html similarity index 100% rename from tests/templates/views/urlarticle_form.html rename to tests/test_templates/views/urlarticle_form.html