diff options
| author | Brian Waldon <brian.waldon@rackspace.com> | 2011-06-27 11:29:29 -0400 |
|---|---|---|
| committer | Brian Waldon <brian.waldon@rackspace.com> | 2011-06-27 11:29:29 -0400 |
| commit | 8df250af09b6319d5dc70d42469121f04401548f (patch) | |
| tree | 8096570cef22ad0d980674c8b2f04b6dc250bb50 | |
| parent | 7746fffe58e91eadf6597b13e166f6a3e5894c53 (diff) | |
making key in images metadata xml serialization test null as well
| -rw-r--r-- | nova/api/openstack/image_metadata.py | 2 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_image_metadata.py | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/nova/api/openstack/image_metadata.py b/nova/api/openstack/image_metadata.py index 7b138dc27..d72a9e0a4 100644 --- a/nova/api/openstack/image_metadata.py +++ b/nova/api/openstack/image_metadata.py @@ -117,7 +117,7 @@ class ImageMetadataXMLSerializer(wsgi.XMLDictSerializer): def _meta_item_to_xml(self, doc, key, value): node = doc.createElement('meta') - node.setAttribute('key', key) + node.setAttribute('key', str(key)) text = doc.createTextNode(str(value)) node.appendChild(text) return node diff --git a/nova/tests/api/openstack/test_image_metadata.py b/nova/tests/api/openstack/test_image_metadata.py index 874b7cb4b..a91d61d8f 100644 --- a/nova/tests/api/openstack/test_image_metadata.py +++ b/nova/tests/api/openstack/test_image_metadata.py @@ -247,11 +247,11 @@ class ImageMetadataXMLSerializationTest(test.TestCase): self.assertEqual(expected.toxml(), actual.toxml()) - def test_index_xml_null_value(self): + def test_index_xml_null_key_and_value(self): serializer = openstack.image_metadata.ImageMetadataXMLSerializer() fixture = { 'metadata': { - 'three': None, + None: None, }, } output = serializer.serialize(fixture, 'index') @@ -259,7 +259,7 @@ class ImageMetadataXMLSerializationTest(test.TestCase): expected = minidom.parseString(""" <metadata xmlns="http://docs.openstack.org/compute/api/v1.1"> - <meta key="three"> + <meta key="None"> None </meta> </metadata> |