diff options
| author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-20 12:45:43 +0000 |
|---|---|---|
| committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2013-02-20 12:45:43 +0000 |
| commit | 335c1ffed3babd8742469e4efadbf4690cae2283 (patch) | |
| tree | 0192bbffe85ef595ef9c19643c4795356bb9dd10 | |
| parent | 29b8977ac03ac9ce0c178ce6febd0a5f27288001 (diff) | |
| parent | b4d343b46883ef52df656f0f6401dc6bb1d6e8dd (diff) | |
| download | morph-335c1ffed3babd8742469e4efadbf4690cae2283.tar.gz | |
Merge branch 'liw/debug-jjardon-assert-fail'
| -rw-r--r-- | morphlib/morphologyfactory.py | 7 | ||||
| -rw-r--r-- | morphlib/morphologyfactory_tests.py | 8 |
2 files changed, 2 insertions, 13 deletions
diff --git a/morphlib/morphologyfactory.py b/morphlib/morphologyfactory.py index d23f55a4..76905eb9 100644 --- a/morphlib/morphologyfactory.py +++ b/morphlib/morphologyfactory.py @@ -111,12 +111,7 @@ class MorphologyFactory(object): '(it is a mandatory field)' % filename) name = morphology['name'] - if morphology['arch'] == 'armv7': - morphology.builds_artifacts = [name + '-kernel', name + '-rootfs'] - else: - # FIXME: -rootfs is a misnomer, should be -disk, but can't - # change this during refactoring. - morphology.builds_artifacts = [name + '-rootfs'] + morphology.builds_artifacts = [name + '-rootfs'] morphology.needs_staging_area = False morphology.needs_artifact_metadata_cached = False diff --git a/morphlib/morphologyfactory_tests.py b/morphlib/morphologyfactory_tests.py index 16d9af69..6e17df48 100644 --- a/morphlib/morphologyfactory_tests.py +++ b/morphlib/morphologyfactory_tests.py @@ -218,17 +218,11 @@ class MorphologyFactoryTests(unittest.TestCase): morph = self.mf.get_morphology('reponame', 'sha1', 'stratum.morph') self.assertEqual(morph.builds_artifacts, ['stratum']) - def test_sets_builds_artifacts_for_x86_64_system(self): + def test_sets_build_artifacts_for_system(self): self.lr.arch = 'x86_64' morph = self.mf.get_morphology('reponame', 'sha1', 'system.morph') self.assertEqual(morph.builds_artifacts, ['system-rootfs']) - def test_sets_builds_artifacts_for_arm_system(self): - self.lr.arch = 'armv7' - morph = self.mf.get_morphology('reponame', 'sha1', 'system.morph') - self.assertEqual(sorted(morph.builds_artifacts), - sorted(['system-rootfs', 'system-kernel'])) - def test_sets_needs_staging_for_chunk(self): morph = self.mf.get_morphology('reponame', 'sha1', 'chunk.morph') self.assertEqual(morph.needs_staging_area, True) |