openstack/horizon
Code Issues Proposed changes

Merge "Fix unicode error when assertMessageCount() fails"

Browse Source
This commit is contained in:
Jenkins
2014-05-02 15:37:18 +00:00
committed by Gerrit Code Review
parent 2cec76b4dc ed9faf84d1
commit 51c1f34966
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
horizon/test/helpers.py
View File

@@ -31,6 +31,7 @@ from django.core.handlers import wsgi
from django import http from django import http
from django import test as django_test from django import test as django_test
from django.test.client import RequestFactory # noqa from django.test.client import RequestFactory # noqa
from django.utils.encoding import force_unicode
from django.utils import unittest from django.utils import unittest
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)
@@ -154,7 +155,8 @@ class TestCase(django_test.TestCase):
# Otherwise, make sure we got the expected messages. # Otherwise, make sure we got the expected messages.
for msg_type, count in kwargs.items(): for msg_type, count in kwargs.items():
msgs = [m.message for m in messages if msg_type in m.tags] msgs = [force_unicode(m.message)
for m in messages if msg_type in m.tags]
assert len(msgs) == count, \ assert len(msgs) == count, \
"%s messages not as expected: %s" % (msg_type.title(), "%s messages not as expected: %s" % (msg_type.title(),
", ".join(msgs)) ", ".join(msgs))