summaryrefslogtreecommitdiff
path: root/morphlib/morphologyfactory_tests.py
diff options
context:
space:
mode:
authorDan Firth <dan.firth@codethink.co.uk>2013-09-27 11:16:56 +0000
committerDan Firth <dan.firth@codethink.co.uk>2013-09-27 11:16:56 +0000
commit5e0ad6ad29fa776088241828580d58b7d91e9fd1 (patch)
treeca7bd78b3fc6f484ddb8407fb444d991617d9b39 /morphlib/morphologyfactory_tests.py
parent1bc8aa188896fc7668427f19a4ffd89ca5f6fa3c (diff)
downloadmorph-5e0ad6ad29fa776088241828580d58b7d91e9fd1.tar.gz
Dropped support for 'system-kind' from system morphology files
Diffstat (limited to 'morphlib/morphologyfactory_tests.py')
-rw-r--r--morphlib/morphologyfactory_tests.py8
1 files changed, 0 insertions, 8 deletions
diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py
index 06489085..6e1e67d3 100644
--- a/morphlib/morphologyfactory_tests.py
+++ b/morphlib/morphologyfactory_tests.py
@@ -118,7 +118,6 @@ class FakeLocalRepo(object):
'system.morph': '''{
"name": "system",
"kind": "system",
- "system-kind": "%(system_kind)s",
"arch": "%(arch)s"
}''',
'parse-error.morph': '''{ "name"''',
@@ -130,13 +129,11 @@ class FakeLocalRepo(object):
def __init__(self):
self.arch = 'x86_64'
- self.system_kind = ''
def cat(self, sha1, filename):
if filename in self.morphologies:
values = {
'arch': self.arch,
- 'system_kind': self.system_kind,
}
return self.morphologies[filename] % values
elif filename.endswith('.morph'):
@@ -308,11 +305,6 @@ class MorphologyFactoryTests(unittest.TestCase):
morph = self.mf.get_morphology('reponame', 'sha1', 'system.morph')
self.assertEqual(morph['arch'], 'armv7l')
- def test_fails_if_system_define_system_kind_that_is_not_tarball(self):
- self.lr.system_kind = 'blahblah'
- 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')