From 629d704d5fccc9b4b5e997b06f34a04b502953d1 Mon Sep 17 00:00:00 2001
From: Preston Timmons <prestontimmons@gfa.org>
Date: Tue, 2 Apr 2013 23:42:30 +0000
Subject: [PATCH] Modified messages to work with unittest2 discovery.

---
 django/contrib/messages/tests/__init__.py              | 10 +++++-----
 .../contrib/messages/tests/{base.py => test_base.py}   |  0
 .../messages/tests/{cookie.py => test_cookie.py}       |  2 +-
 .../messages/tests/{fallback.py => test_fallback.py}   |  6 +++---
 .../tests/{middleware.py => test_middleware.py}        |  0
 .../messages/tests/{mixins.py => test_mixins.py}       |  0
 .../messages/tests/{session.py => test_session.py}     |  2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)
 rename django/contrib/messages/tests/{base.py => test_base.py} (100%)
 rename django/contrib/messages/tests/{cookie.py => test_cookie.py} (99%)
 rename django/contrib/messages/tests/{fallback.py => test_fallback.py} (97%)
 rename django/contrib/messages/tests/{middleware.py => test_middleware.py} (100%)
 rename django/contrib/messages/tests/{mixins.py => test_mixins.py} (100%)
 rename django/contrib/messages/tests/{session.py => test_session.py} (96%)

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
similarity index 100%
rename from django/contrib/messages/tests/base.py
rename to django/contrib/messages/tests/test_base.py
diff --git a/django/contrib/messages/tests/cookie.py b/django/contrib/messages/tests/test_cookie.py
similarity index 99%
rename from django/contrib/messages/tests/cookie.py
rename to 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
similarity index 97%
rename from django/contrib/messages/tests/fallback.py
rename to 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
similarity index 100%
rename from django/contrib/messages/tests/middleware.py
rename to django/contrib/messages/tests/test_middleware.py
diff --git a/django/contrib/messages/tests/mixins.py b/django/contrib/messages/tests/test_mixins.py
similarity index 100%
rename from django/contrib/messages/tests/mixins.py
rename to django/contrib/messages/tests/test_mixins.py
diff --git a/django/contrib/messages/tests/session.py b/django/contrib/messages/tests/test_session.py
similarity index 96%
rename from django/contrib/messages/tests/session.py
rename to 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