From 70abcdc17b1a91582708133dcf0491e9549dce9c Mon Sep 17 00:00:00 2001 From: Michael Auchter Date: Tue, 20 Apr 2021 10:06:23 -0500 Subject: mpm: check-filesystem: liberalize version check check-filesystem assumed that UHD's version string always had the format of --. However, this is not always the case; see ./host/cmake/Modules/UHDVersion.cmake for more details. Instead of trying to parse the version string into components, just check to make sure the version and git hash are present in the version string. --- mpm/tools/check-filesystem | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mpm/tools') diff --git a/mpm/tools/check-filesystem b/mpm/tools/check-filesystem index f824e88b2..1ceb7b993 100755 --- a/mpm/tools/check-filesystem +++ b/mpm/tools/check-filesystem @@ -50,11 +50,11 @@ class CheckFilesystem(unittest.TestCase): def test_uhd_version(self): uhd_version = get_uhd_version(filesystem_root=self.args.filesystem_root) - self.assertEqual(uhd_version['version'], self.args.uhd_version) + self.assertIn(self.args.uhd_version, uhd_version) def test_uhd_githash(self): uhd_version = get_uhd_version(filesystem_root=self.args.filesystem_root) - self.assertEqual(uhd_version['githash'], self.args.uhd_githash) + self.assertIn(self.args.uhd_githash, uhd_version) def test_mender_artifact(self): mender_artifact = get_mender_artifact(filesystem_root=self.args.filesystem_root) -- cgit v1.2.3