diff options
| author | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
|---|---|---|
| committer | Adam Coldrick <adam.coldrick@codethink.co.uk> | 2014-08-14 13:45:59 +0000 |
| commit | c1c331e7c545c7a2f0545d3b1ef9751c9571d357 (patch) | |
| tree | d2a4edf71f2c7204808e4543f3d743a81e95a1bd /morphlib/artifact_tests.py | |
| parent | b2786c73c0f4d4b76f824e309598ce57065e30ab (diff) | |
| parent | 5f705f1e2c95b988ae39df7820f4034c49f375e4 (diff) | |
| download | morph-c1c331e7c545c7a2f0545d3b1ef9751c9571d357.tar.gz | |
Merge branch 'baserock/adamcoldrick/remove-morph2-tweaked'
Reviewed-by:
Richard Maw
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' |