diff options
| author | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
|---|---|---|
| committer | Jason M. Bills <jason.m.bills@linux.intel.com> | 2019-10-28 20:16:02 +0300 |
| commit | da710c8bb0dea17982efc20ab4ee226a86992e6f (patch) | |
| tree | 06c83c9e85c881f40532972aaa1453298236e029 /poky/meta/lib/oeqa/selftest/cases/imagefeatures.py | |
| parent | 6656af78e6c7b48a1252459a61b3b72dce77ab44 (diff) | |
| parent | 2795589128d1f7509ac0ab9eba940d868413ac7d (diff) | |
| download | openbmc-da710c8bb0dea17982efc20ab4ee226a86992e6f.tar.xz | |
Merge branch 'master' of ssh://git-amr-1.devtools.intel.com:29418/openbmc-openbmc into update
Diffstat (limited to 'poky/meta/lib/oeqa/selftest/cases/imagefeatures.py')
| -rw-r--r-- | poky/meta/lib/oeqa/selftest/cases/imagefeatures.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py index 8213d63e3..cf2a42aab 100644 --- a/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py +++ b/poky/meta/lib/oeqa/selftest/cases/imagefeatures.py @@ -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): """ |