openstack
/
nova
Code Issues Proposed changes

Merge "Port api.openstack.compute.test_disk_config to Python 3"

This commit is contained in:
Jenkins 2016-12-24 12:38:53 +00:00 committed by Gerrit Code Review
parent 2385b68490 282dd9aea5
commit 4a0783fad7
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nova/tests/unit/api/openstack/compute/test_disk_config.py
View File

@ -17,6 +17,7 @@ import datetime
import mock
from oslo_serialization import jsonutils
import six
from nova.api.openstack import compute
from nova.compute import api as compute_api
@ -132,9 +133,14 @@ class DiskConfigTestCaseV21(test.TestCase):
self.app = compute.APIRouterV21()
def _get_expected_msg_for_invalid_disk_config(self):
return ('{{"badRequest": {{"message": "Invalid input for'
' field/attribute {0}. Value: {1}. u\'{1}\' is'
' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}')
if six.PY3:
return ('{{"badRequest": {{"message": "Invalid input for'
' field/attribute {0}. Value: {1}. \'{1}\' is'
' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}')
else:
return ('{{"badRequest": {{"message": "Invalid input for'
' field/attribute {0}. Value: {1}. u\'{1}\' is'
' not one of [\'AUTO\', \'MANUAL\']", "code": 400}}}}')
def _setup_fake_image_service(self):
self.image_service = nova.tests.unit.image.fake.stub_out_image_service(
@ -360,8 +366,8 @@ class DiskConfigTestCaseV21(test.TestCase):
expected_msg = self._get_expected_msg_for_invalid_disk_config()
expected_msg = expected_msg.format(API_DISK_CONFIG, 'server_test')
self.assertEqual(jsonutils.loads(expected_msg),
jsonutils.loads(res.body))
self.assertJsonEqual(jsonutils.loads(expected_msg),
jsonutils.loads(res.body))
@mock.patch('nova.api.openstack.common.get_instance')
def _test_rebuild_server_disk_config(self, uuid, disk_config,

1
tests-py3.txt
View File

@ -1,4 +1,3 @@
nova.tests.unit.api.openstack.compute.test_disk_config.DiskConfigTestCaseV21
nova.tests.unit.api.openstack.compute.test_neutron_security_groups.TestNeutronSecurityGroupRulesV21
nova.tests.unit.api.openstack.compute.test_neutron_security_groups.TestNeutronSecurityGroupsOutputTest
nova.tests.unit.api.openstack.compute.test_security_group_default_rules.TestSecurityGroupDefaultRulesNeutronV21