summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gmail.com>2013-04-06 13:43:31 -0500
committerCarl Meyer <carl@oddbird.net>2013-04-12 15:10:04 -0600
commit3ca3d2206c31ed251474d66b6775fa0903c09eae (patch)
treeb69d977cb5f5b080dcdf584ee4ded6ca2b2f0df9 /tests
parent5e84abec14fe43cc08198411cbd2b67804ab7e47 (diff)
Modified generic_views for unittest2 discovery.
Diffstat (limited to 'tests')
-rw-r--r--tests/generic_views/test_base.py (renamed from tests/generic_views/base.py)0
-rw-r--r--tests/generic_views/test_dates.py (renamed from tests/generic_views/dates.py)0
-rw-r--r--tests/generic_views/test_detail.py (renamed from tests/generic_views/detail.py)0
-rw-r--r--tests/generic_views/test_edit.py (renamed from tests/generic_views/edit.py)0
-rw-r--r--tests/generic_views/test_forms.py (renamed from tests/generic_views/forms.py)0
-rw-r--r--tests/generic_views/test_list.py (renamed from tests/generic_views/list.py)0
-rw-r--r--tests/generic_views/tests.py10
-rw-r--r--tests/generic_views/views.py2
8 files changed, 6 insertions, 6 deletions
diff --git a/tests/generic_views/base.py b/tests/generic_views/test_base.py
index 0e84e17132..0e84e17132 100644
--- a/tests/generic_views/base.py
+++ b/tests/generic_views/test_base.py
diff --git a/tests/generic_views/dates.py b/tests/generic_views/test_dates.py
index 263326322e..263326322e 100644
--- a/tests/generic_views/dates.py
+++ b/tests/generic_views/test_dates.py
diff --git a/tests/generic_views/detail.py b/tests/generic_views/test_detail.py
index faee05688e..faee05688e 100644
--- a/tests/generic_views/detail.py
+++ b/tests/generic_views/test_detail.py
diff --git a/tests/generic_views/edit.py b/tests/generic_views/test_edit.py
index c54d632363..c54d632363 100644
--- a/tests/generic_views/edit.py
+++ b/tests/generic_views/test_edit.py
diff --git a/tests/generic_views/forms.py b/tests/generic_views/test_forms.py
index e036ad8afc..e036ad8afc 100644
--- a/tests/generic_views/forms.py
+++ b/tests/generic_views/test_forms.py
diff --git a/tests/generic_views/list.py b/tests/generic_views/test_list.py
index cc4d2f5966..cc4d2f5966 100644
--- a/tests/generic_views/list.py
+++ b/tests/generic_views/test_list.py
diff --git a/tests/generic_views/tests.py b/tests/generic_views/tests.py
index 3f80600efe..244aa3c701 100644
--- a/tests/generic_views/tests.py
+++ b/tests/generic_views/tests.py
@@ -1,11 +1,11 @@
from __future__ import absolute_import
-from .base import (ViewTest, TemplateViewTest, RedirectViewTest,
+from .test_base import (ViewTest, TemplateViewTest, RedirectViewTest,
GetContextDataTest)
-from .dates import (ArchiveIndexViewTests, YearArchiveViewTests,
+from .test_dates import (ArchiveIndexViewTests, YearArchiveViewTests,
MonthArchiveViewTests, WeekArchiveViewTests, DayArchiveViewTests,
DateDetailViewTests)
-from .detail import DetailViewTest
-from .edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
+from .test_detail import DetailViewTest
+from .test_edit import (FormMixinTests, BasicFormTests, ModelFormMixinTests,
CreateViewTests, UpdateViewTests, DeleteViewTests)
-from .list import ListViewTests
+from .test_list import ListViewTests
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index 856565a953..69bfcb32dd 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -7,7 +7,7 @@ from django.core.urlresolvers import reverse, reverse_lazy
from django.utils.decorators import method_decorator
from django.views import generic
-from .forms import AuthorForm, ContactForm
+from .test_forms import AuthorForm, ContactForm
from .models import Artist, Author, Book, Page, BookSigning