diff options
author | Ross Burton <ross.burton@intel.com> | 2019-10-09 12:00:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-10-09 14:07:43 +0100 |
commit | cfc27f68fb948b1b2bc22841cf97a117efca8d5b (patch) | |
tree | e73dcb6847a1bcf1f5a64a1c66c1fc989113ed23 /meta | |
parent | 3e8fef6e679f1f3b51874471e3b631f5c2a769f5 (diff) | |
download | poky-cfc27f68fb948b1b2bc22841cf97a117efca8d5b.tar.gz |
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/imagefeatures.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/lib/oeqa/selftest/cases/imagefeatures.py b/meta/lib/oeqa/selftest/cases/imagefeatures.py index 8213d63e37..cf2a42aab5 100644 --- a/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/meta/lib/oeqa/selftest/cases/imagefeatures.py | |||
@@ -161,8 +161,12 @@ class ImageFeatures(OESelftestTestCase): | |||
161 | sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal') | 161 | sysroot = get_bb_var('STAGING_DIR_NATIVE', 'core-image-minimal') |
162 | result = runCmd('qemu-img info --output json %s' % image_path, | 162 | result = runCmd('qemu-img info --output json %s' % image_path, |
163 | native_sysroot=sysroot) | 163 | native_sysroot=sysroot) |
164 | self.assertTrue(json.loads(result.output).get('format') == itype, | 164 | try: |
165 | msg="Could not parse '%s'" % result.output) | 165 | data = json.loads(result.output) |
166 | self.assertEqual(data.get('format'), itype, | ||
167 | msg="Unexpected format in '%s'" % (result.output)) | ||
168 | except json.decoder.JSONDecodeError: | ||
169 | self.fail("Could not parse '%ss'" % result.output) | ||
166 | 170 | ||
167 | def test_long_chain_conversion(self): | 171 | def test_long_chain_conversion(self): |
168 | """ | 172 | """ |