diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2013-10-08 15:53:21 +0000 |
commit | 6e36e9a1a29495f0c8b62fedddadcf8df78506d9 (patch) | |
tree | 609fc24eaf3d9ac9ed14d6520cccae147a7f3907 /morphlib/morphloader_tests.py | |
parent | c63bd810e953429b728adbadf60f10a08e6d4a06 (diff) | |
parent | f4aaea23b7d80084504832d6b967a50c2d501b9e (diff) | |
download | morph-6e36e9a1a29495f0c8b62fedddadcf8df78506d9.tar.gz |
Merge remote-tracking branch 'origin/danielfirth/RT189'
Changed the error (exception) to list all obsolete fields.
Diffstat (limited to 'morphlib/morphloader_tests.py')
-rw-r--r-- | morphlib/morphloader_tests.py | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/morphlib/morphloader_tests.py b/morphlib/morphloader_tests.py index ac0fef53..f38d58e8 100644 --- a/morphlib/morphloader_tests.py +++ b/morphlib/morphloader_tests.py @@ -94,6 +94,26 @@ build-system: dummy self.assertRaises( morphlib.morphloader.InvalidFieldError, self.loader.validate, m) + def test_fails_to_validate_system_with_obsolete_system_kind_field(self): + m = morphlib.morph3.Morphology({ + 'kind': 'system', + 'name': 'foo', + 'arch': 'x86_64', + 'system-kind': 'foo', + }) + self.assertRaises( + morphlib.morphloader.ObsoleteFieldsError, self.loader.validate, m) + + def test_fails_to_validate_system_with_obsolete_disk_size_field(self): + m = morphlib.morph3.Morphology({ + 'kind': 'system', + 'name': 'foo', + 'arch': 'x86_64', + 'disk-size': 'over 9000', + }) + self.assertRaises( + morphlib.morphloader.ObsoleteFieldsError, self.loader.validate, m) + def test_fails_to_validate_system_with_no_fields(self): m = morphlib.morph3.Morphology({ 'kind': 'system', @@ -182,22 +202,6 @@ build-system: dummy self.loader.validate(m) self.assertEqual(m['arch'], 'armv7l') - def test_validate_requires_system_kind_to_be_tarball_if_present(self): - m = morphlib.morph3.Morphology( - { - "kind": "system", - "name": "foo", - "arch": "armv7l", - "strata": [], - "system-kind": "blah", - }) - - self.assertRaises( - morphlib.morphloader.InvalidSystemKindError, - self.loader.validate, m) - m['system-kind'] = 'rootfs-tarball' - self.loader.validate(m) - def test_validate_requires_build_deps_for_chunks_in_strata(self): m = morphlib.morph3.Morphology( { @@ -468,13 +472,11 @@ name: foo dict(m), { 'kind': 'system', - 'system-kind': 'rootfs-tarball', 'name': 'foo', 'description': '', 'arch': 'x86_64', 'strata': [], 'configuration-extensions': [], - 'disk-size': '1G', }) def test_unsets_defaults_for_system(self): |