oeqa/selftest/imagefeatures: improve test_hypervisor_fmts

If this test fails then the output doesn't help in any meaningful way, so
improve the test to output the unparsable JSON and display unexpected output.

(From OE-Core rev: 6a710ad0b445295991b17545f634684f4f317099)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2019-10-09 12:00:51 +01:00
committed by Richard Purdie
parent 3e8fef6e67
commit cfc27f68fb

View File

@@ -161,8 +161,12 @@ class ImageFeatures(OESelftestTestCase):
sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal')
result = runCmd('qemu-img info --output json %s' % image_path,
native_sysroot=sysroot)
self.assertTrue(json.loads(result.output).get('format') == itype,
msg="Could not parse '%s'" % result.output)
try:
data = json.loads(result.output)
self.assertEqual(data.get('format'), itype,
msg="Unexpected format in '%s'" % (result.output))
except json.decoder.JSONDecodeError:
self.fail("Could not parse '%ss'" % result.output)
def test_long_chain_conversion(self):
"""