openstack/python-neutronclient
Code Issues Proposed changes

Merge "Make _test_update_resource honor format"

Browse Source
This commit is contained in:
Jenkins
2013-09-02 22:05:33 +00:00
committed by Gerrit Code Review
parent 721b0c88c3 4b14da1811
commit 375dcffb6d
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
neutronclient/tests/unit/test_cli20.py
View File

@@ -216,6 +216,8 @@ class CLITestV20Base(testtools.TestCase):
resource_plural = neutronV2_0._get_resource_plural(resource,
self.client)
path = getattr(self.client, resource_plural + "_path")
# Work around for LP #1217791. XML deserializer called from
# MyComparator does not decodes XML string correctly.
if self.format == 'json':
mox_body = MyComparator(body, self.client)
else:
@@ -391,11 +393,18 @@ class CLITestV20Base(testtools.TestCase):
cmd.get_client().MultipleTimes().AndReturn(self.client)
body = {resource: extrafields}
path = getattr(self.client, resource + "_path")
self.client.format = self.format
# Work around for LP #1217791. XML deserializer called from
# MyComparator does not decodes XML string correctly.
if self.format == 'json':
mox_body = MyComparator(body, self.client)
else:
mox_body = self.client.serialize(body)
self.client.httpclient.request(
MyUrlComparator(end_url(path % myid, format=self.format),
self.client),
'PUT',
body=MyComparator(body, self.client),
body=mox_body,
headers=mox.ContainsKeyValue(
'X-Auth-Token', TOKEN)).AndReturn((MyResp(204), None))
args.extend(['--request-format', self.format])