diff options
author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-08 09:58:59 +0000 |
---|---|---|
committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-08 15:22:50 +0000 |
commit | 3bd990a61084d8e21c0b4225a800134a667272fc (patch) | |
tree | 57073b6af15eb2e22b97a7a5afc1d89e77553e1a /morphlib/artifact_tests.py | |
parent | 59740ba3a5839bb0d25a74f2b0387ee36bf81279 (diff) | |
download | morph-3bd990a61084d8e21c0b4225a800134a667272fc.tar.gz |
unittests: Make the unittests use morphloader
This commit removes all use of morph2 from the unittests, replacing it
with morphloader/morph3. It also converts the test morphologies to YAML.
Diffstat (limited to 'morphlib/artifact_tests.py')
-rw-r--r-- | morphlib/artifact_tests.py | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/morphlib/artifact_tests.py b/morphlib/artifact_tests.py index d4b15cba..62b1bfb9 100644 --- a/morphlib/artifact_tests.py +++ b/morphlib/artifact_tests.py @@ -23,24 +23,22 @@ import morphlib class ArtifactTests(unittest.TestCase): def setUp(self): - morph = morphlib.morph2.Morphology( - ''' - { - "name": "chunk", - "kind": "chunk", - "chunks": { - "chunk-runtime": [ - "usr/bin", - "usr/sbin", - "usr/lib", - "usr/libexec" - ], - "chunk-devel": [ - "usr/include" - ] - } - } - ''') + loader = morphlib.morphloader.MorphologyLoader() + morph = loader.load_from_string( + ''' + name: chunk + kind: chunk + products: + - artifact: chunk-runtime + include: + - usr/bin + - usr/sbin + - usr/lib + - usr/libexec + - artifact: chunk-devel + include: + - usr/include + ''') self.source = morphlib.source.Source( 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') self.artifact_name = 'chunk-runtime' |