diff options
author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-01 16:22:03 +0100 |
---|---|---|
committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-08-01 16:22:03 +0100 |
commit | 81a5a94da7091489a65781763995e8969591d8c3 (patch) | |
tree | f8fc167e5ce1ddb6e8ea4da67a9c558c80731a82 /morphlib/morphologyfactory_tests.py | |
parent | 9cead0f819c128acc07d9e7499cc5bb9773915ae (diff) | |
parent | 936fc1ec1cd9156f6aafdfcec391f12a6cf22603 (diff) | |
download | morph-81a5a94da7091489a65781763995e8969591d8c3.tar.gz |
Merge branch 'master' of roadtrain.codethink.co.uk:baserock/morph
Conflicts:
morphlib/morphologyfactory.py
morphlib/morphologyfactory_tests.py
Diffstat (limited to 'morphlib/morphologyfactory_tests.py')
-rw-r--r-- | morphlib/morphologyfactory_tests.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py index b00a496a..39331262 100644 --- a/morphlib/morphologyfactory_tests.py +++ b/morphlib/morphologyfactory_tests.py @@ -63,6 +63,9 @@ class FakeLocalRepo(object): "system-kind": "%(system_kind)s", "arch": "%(arch)s" }''', + 'parse-error.morph': '''{ + "name" + }''', } def __init__(self): @@ -229,3 +232,8 @@ class MorphologyFactoryTests(unittest.TestCase): self.lr.system_kind = '' self.assertRaises(morphlib.Error, self.mf.get_morphology, 'reponame', 'sha1', 'system.morph') + + def test_fails_on_parse_error(self): + self.assertRaises(morphlib.Error, self.mf.get_morphology, + 'reponame', 'sha1', 'parse-error.morph') + |