summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPreston Timmons <prestontimmons@gfa.org>2013-04-02 23:42:30 +0000
committerCarl Meyer <carl@oddbird.net>2013-04-02 20:12:30 -0600
commit629d704d5fccc9b4b5e997b06f34a04b502953d1 (patch)
tree1c886d299c451b0f3dd16de528ac46375c7a520a
parent756a70b48de73daccf2a4581996830900239a4b7 (diff)
Modified messages to work with unittest2 discovery.
-rw-r--r--django/contrib/messages/tests/__init__.py10
-rw-r--r--django/contrib/messages/tests/test_base.py (renamed from django/contrib/messages/tests/base.py)0
-rw-r--r--django/contrib/messages/tests/test_cookie.py (renamed from django/contrib/messages/tests/cookie.py)2
-rw-r--r--django/contrib/messages/tests/test_fallback.py (renamed from django/contrib/messages/tests/fallback.py)6
-rw-r--r--django/contrib/messages/tests/test_middleware.py (renamed from django/contrib/messages/tests/middleware.py)0
-rw-r--r--django/contrib/messages/tests/test_mixins.py (renamed from django/contrib/messages/tests/mixins.py)0
-rw-r--r--django/contrib/messages/tests/test_session.py (renamed from django/contrib/messages/tests/session.py)2
7 files changed, 10 insertions, 10 deletions
diff --git a/django/contrib/messages/tests/__init__.py b/django/contrib/messages/tests/__init__.py
index 25a0f9aa25..e57594dec9 100644
--- a/django/contrib/messages/tests/__init__.py
+++ b/django/contrib/messages/tests/__init__.py
@@ -1,5 +1,5 @@
-from django.contrib.messages.tests.cookie import CookieTest
-from django.contrib.messages.tests.fallback import FallbackTest
-from django.contrib.messages.tests.middleware import MiddlewareTest
-from django.contrib.messages.tests.session import SessionTest
-from django.contrib.messages.tests.mixins import SuccessMessageMixinTests
+from django.contrib.messages.tests.test_cookie import CookieTest
+from django.contrib.messages.tests.test_fallback import FallbackTest
+from django.contrib.messages.tests.test_middleware import MiddlewareTest
+from django.contrib.messages.tests.test_session import SessionTest
+from django.contrib.messages.tests.test_mixins import SuccessMessageMixinTests
diff --git a/django/contrib/messages/tests/base.py b/django/contrib/messages/tests/test_base.py
index b3ced12773..b3ced12773 100644
--- a/django/contrib/messages/tests/base.py
+++ b/django/contrib/messages/tests/test_base.py
diff --git a/django/contrib/messages/tests/cookie.py b/django/contrib/messages/tests/test_cookie.py
index 77e4ece091..630edfe3b0 100644
--- a/django/contrib/messages/tests/cookie.py
+++ b/django/contrib/messages/tests/test_cookie.py
@@ -1,7 +1,7 @@
import json
from django.contrib.messages import constants
-from django.contrib.messages.tests.base import BaseTest
+from django.contrib.messages.tests.test_base import BaseTest
from django.contrib.messages.storage.cookie import (CookieStorage,
MessageEncoder, MessageDecoder)
from django.contrib.messages.storage.base import Message
diff --git a/django/contrib/messages/tests/fallback.py b/django/contrib/messages/tests/test_fallback.py
index 0aa65008da..9a1d772fb7 100644
--- a/django/contrib/messages/tests/fallback.py
+++ b/django/contrib/messages/tests/test_fallback.py
@@ -1,10 +1,10 @@
from django.contrib.messages import constants
from django.contrib.messages.storage.fallback import (FallbackStorage,
CookieStorage)
-from django.contrib.messages.tests.base import BaseTest
-from django.contrib.messages.tests.cookie import (set_cookie_data,
+from django.contrib.messages.tests.test_base import BaseTest
+from django.contrib.messages.tests.test_cookie import (set_cookie_data,
stored_cookie_messages_count)
-from django.contrib.messages.tests.session import (set_session_data,
+from django.contrib.messages.tests.test_session import (set_session_data,
stored_session_messages_count)
diff --git a/django/contrib/messages/tests/middleware.py b/django/contrib/messages/tests/test_middleware.py
index 5618c2d2b2..5618c2d2b2 100644
--- a/django/contrib/messages/tests/middleware.py
+++ b/django/contrib/messages/tests/test_middleware.py
diff --git a/django/contrib/messages/tests/mixins.py b/django/contrib/messages/tests/test_mixins.py
index 8eef4cb3dc..8eef4cb3dc 100644
--- a/django/contrib/messages/tests/mixins.py
+++ b/django/contrib/messages/tests/test_mixins.py
diff --git a/django/contrib/messages/tests/session.py b/django/contrib/messages/tests/test_session.py
index e162f49fc2..2aa84d04ca 100644
--- a/django/contrib/messages/tests/session.py
+++ b/django/contrib/messages/tests/test_session.py
@@ -1,5 +1,5 @@
from django.contrib.messages import constants
-from django.contrib.messages.tests.base import BaseTest
+from django.contrib.messages.tests.test_base import BaseTest
from django.contrib.messages.storage.base import Message
from django.contrib.messages.storage.session import SessionStorage
from django.utils.safestring import SafeData, mark_safe