Merge "Port test_exception to Python 3"

This commit is contained in:
Jenkins 2015-07-10 03:10:57 +00:00 committed by Gerrit Code Review
commit 0f80884ae0
2 changed files with 7 additions and 2 deletions

View File

@ -123,8 +123,12 @@ class NovaExceptionTestCase(test.NoDBTestCase):
class FakeNovaException_Remote(exception.NovaException):
msg_fmt = "some message"
def __unicode__(self):
return u"print the whole trace"
if six.PY3:
def __str__(self):
return "print the whole trace"
else:
def __unicode__(self):
return u"print the whole trace"
exc = FakeNovaException_Remote()
self.assertEqual(six.text_type(exc), u"print the whole trace")

View File

@ -36,6 +36,7 @@ deps = -r{toxinidir}/requirements.txt
commands =
find . -type f -name "*.pyc" -delete
python -m testtools.run \
nova.tests.unit.test_exception \
nova.tests.unit.db.test_db_api \
nova.tests.unit.test_versions \
nova.tests.unit.objects.test_agent \