Merge "[Py34] api.openstack.test_faults.TestFaultWrapper"
This commit is contained in:
@@ -16,7 +16,6 @@
|
|||||||
|
|
||||||
import mock
|
import mock
|
||||||
from oslo_serialization import jsonutils
|
from oslo_serialization import jsonutils
|
||||||
import six
|
|
||||||
import webob
|
import webob
|
||||||
import webob.dec
|
import webob.dec
|
||||||
import webob.exc
|
import webob.exc
|
||||||
@@ -57,7 +56,7 @@ class TestFaultWrapper(test.NoDBTestCase):
|
|||||||
# translate().
|
# translate().
|
||||||
mock_translate.assert_any_call(u'Should be translated.', None)
|
mock_translate.assert_any_call(u'Should be translated.', None)
|
||||||
# The return value from translate() should appear in the response.
|
# The return value from translate() should appear in the response.
|
||||||
self.assertIn("I've been translated!", six.text_type(response.body))
|
self.assertIn("I've been translated!", response.body.decode("UTF-8"))
|
||||||
|
|
||||||
|
|
||||||
class TestFaults(test.NoDBTestCase):
|
class TestFaults(test.NoDBTestCase):
|
||||||
|
|||||||
@@ -139,7 +139,6 @@ nova.tests.unit.api.openstack.compute.test_volumes.VolumeApiTestV2
|
|||||||
nova.tests.unit.api.openstack.compute.test_volumes.VolumeApiTestV21
|
nova.tests.unit.api.openstack.compute.test_volumes.VolumeApiTestV21
|
||||||
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV2
|
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV2
|
||||||
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV21
|
nova.tests.unit.api.openstack.compute.test_volumes.VolumeAttachTestsV21
|
||||||
nova.tests.unit.api.openstack.test_faults.TestFaultWrapper
|
|
||||||
nova.tests.unit.api.test_compute_req_id.RequestIdTest
|
nova.tests.unit.api.test_compute_req_id.RequestIdTest
|
||||||
nova.tests.unit.api.test_validator.ValidatorTestCase
|
nova.tests.unit.api.test_validator.ValidatorTestCase
|
||||||
nova.tests.unit.api.test_wsgi.Test
|
nova.tests.unit.api.test_wsgi.Test
|
||||||
|
|||||||
Reference in New Issue
Block a user