openstack/nova
Code Issues Proposed changes

Merge "Use JSON format instead of json format"

Browse Source
This commit is contained in:
Jenkins 2015-11-16 20:33:10 +00:00 committed by Gerrit Code Review
commit 4c06d9073c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/tests/unit/virt/libvirt/test_imagecache.py
View File

@ -960,7 +960,7 @@ class VerifyChecksumTestCase(test.NoDBTestCase):
log = stream.getvalue()
# NOTE(mikal): this is a skip not a fail because the file is
# present, but is not in valid json format and therefore is
# present, but is not in valid JSON format and therefore is
# skipped.
self.assertNotEqual(log.find('image verification skipped'), -1)

2
nova/virt/hardware.py
View File

@ -1241,7 +1241,7 @@ def host_topology_and_format_from_host(host):
get beck either None, or an instance of objects.NUMATopology class.
:returns: A two-tuple, first element is the topology itself or None, second
is a boolean set to True if topology was in json format.
is a boolean set to True if topology was in JSON format.
"""
was_json = False
try: