aboutsummaryrefslogtreecommitdiffstats
path: root/mpm/tools/check-filesystem
diff options
context:
space:
mode:
authorMichael Auchter <michael.auchter@ni.com>2021-04-20 10:06:23 -0500
committermichael-west <michael.west@ettus.com>2021-06-02 22:28:43 -0700
commit70abcdc17b1a91582708133dcf0491e9549dce9c (patch)
treeaac073e45bfd0eb762deb12c152982fdce04c6e3 /mpm/tools/check-filesystem
parent4ac80a4312221825787095dfc58c19b15f7d8d60 (diff)
downloaduhd-70abcdc17b1a91582708133dcf0491e9549dce9c.tar.gz
uhd-70abcdc17b1a91582708133dcf0491e9549dce9c.tar.bz2
uhd-70abcdc17b1a91582708133dcf0491e9549dce9c.zip
mpm: check-filesystem: liberalize version check
check-filesystem assumed that UHD's version string always had the format of <version>-<git_count>-<git_hash>. 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.
Diffstat (limited to 'mpm/tools/check-filesystem')
-rwxr-xr-xmpm/tools/check-filesystem4
1 files changed, 2 insertions, 2 deletions
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)