Commit 629d704d authored by Preston Timmons's avatar Preston Timmons Committed by Carl Meyer
Browse files

Modified messages to work with unittest2 discovery.

parent 756a70b4

django/contrib/messages/tests/__init__.py

+5 −5
Original line number Diff line number Diff line 
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

django/contrib/messages/tests/cookie.py→django/contrib/messages/tests/test_cookie.py

+1 −1
Original line number Diff line number Diff line 
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

django/contrib/messages/tests/fallback.py→django/contrib/messages/tests/test_fallback.py

+3 −3
Original line number Diff line number Diff line 
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)