diff options
author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-05 17:12:26 +0000 |
---|---|---|
committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-09-05 17:12:26 +0000 |
commit | b9488584415d94fc28c2e064b917183b851af07b (patch) | |
tree | ebdb4f647c43afd633fcc5243e26ef24c6096628 /morphlib/artifactresolver_tests.py | |
parent | 083fd4de011e0fcf4a445b38a7fa6ef8964a5ccb (diff) | |
download | morph-b9488584415d94fc28c2e064b917183b851af07b.tar.gz |
Resolve tree SHA1 along with commit SHA1 when resolving refs
Adjust all other parts and the tests to work with this.
Diffstat (limited to 'morphlib/artifactresolver_tests.py')
-rw-r--r-- | morphlib/artifactresolver_tests.py | 86 |
1 files changed, 43 insertions, 43 deletions
diff --git a/morphlib/artifactresolver_tests.py b/morphlib/artifactresolver_tests.py index 1371162c..5510b1cf 100644 --- a/morphlib/artifactresolver_tests.py +++ b/morphlib/artifactresolver_tests.py @@ -109,7 +109,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk') source = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(source) artifacts = self.resolver.resolve_artifacts(pool) @@ -126,7 +126,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk', ['chunk-runtime']) source = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(source) artifacts = self.resolver.resolve_artifacts(pool) @@ -142,7 +142,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk', ['chunk-runtime', 'chunk-devel']) source = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(source) artifacts = self.resolver.resolve_artifacts(pool) @@ -172,7 +172,7 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['foo'] stratum = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'foo.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'foo.morph') pool.add(stratum) artifacts = self.resolver.resolve_artifacts(pool) @@ -194,7 +194,7 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['foo-rootfs'] system = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'foo.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'foo.morph') pool.add(system) artifacts = self.resolver.resolve_artifacts(pool) @@ -217,7 +217,7 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['foo-rootfs', 'foo-kernel'] system = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'foo.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'foo.morph') pool.add(system) artifacts = self.resolver.resolve_artifacts(pool) @@ -234,13 +234,13 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk') chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) morph = FakeStratumMorphology( 'stratum', chunks=[('chunk', 'chunk', 'repo', 'ref')]) stratum = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) artifacts = self.resolver.resolve_artifacts(pool) @@ -262,7 +262,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk', ['chunk-devel', 'chunk-runtime']) chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) morph = FakeStratumMorphology( @@ -272,7 +272,7 @@ class ArtifactResolverTests(unittest.TestCase): ('chunk-runtime', 'chunk', 'repo', 'ref') ]) stratum = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) artifacts = self.resolver.resolve_artifacts(pool) @@ -300,14 +300,14 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk', ['chunk-devel', 'chunk-runtime']) chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) morph = FakeStratumMorphology( 'stratum', chunks=[('chunk-runtime', 'chunk', 'repo', 'ref')]) stratum = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) artifacts = self.resolver.resolve_artifacts(pool) @@ -329,12 +329,12 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('foo') foo_chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'foo.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'foo.morph') pool.add(foo_chunk) morph = FakeChunkMorphology('bar') bar_chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'bar.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'bar.morph') pool.add(bar_chunk) morph = FakeStratumMorphology( @@ -344,7 +344,7 @@ class ArtifactResolverTests(unittest.TestCase): ('bar', 'bar', 'repo', 'ref') ]) stratum = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) artifacts = self.resolver.resolve_artifacts(pool) @@ -372,7 +372,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeStratumMorphology('stratum1') stratum1 = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum1.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum1.morph') pool.add(stratum1) morph = FakeStratumMorphology( @@ -380,7 +380,7 @@ class ArtifactResolverTests(unittest.TestCase): chunks=[], build_depends=[('stratum1', 'repo', 'ref')]) stratum2 = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum2.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum2.morph') pool.add(stratum2) artifacts = self.resolver.resolve_artifacts(pool) @@ -402,7 +402,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeStratumMorphology('stratum1') stratum1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum1.morph') pool.add(stratum1) morph = FakeStratumMorphology( @@ -413,17 +413,17 @@ class ArtifactResolverTests(unittest.TestCase): ], build_depends=[('stratum1', 'repo', 'original/ref')]) stratum2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum2.morph') pool.add(stratum2) morph = FakeChunkMorphology('chunk1') chunk1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk1.morph') pool.add(chunk1) morph = FakeChunkMorphology('chunk2') chunk2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk2.morph') pool.add(chunk2) artifacts = self.resolver.resolve_artifacts(pool) @@ -458,7 +458,7 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeStratumMorphology('stratum1') stratum1 = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum1.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum1.morph') pool.add(stratum1) morph = morphlib.morph2.Morphology( @@ -482,13 +482,13 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['system-rootfs'] system = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'system.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'system.morph') pool.add(system) morph = FakeStratumMorphology( 'stratum2', chunks=[], build_depends=[('stratum1', 'repo', 'ref')]) stratum2 = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum2.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum2.morph') pool.add(stratum2) artifacts = self.resolver.resolve_artifacts(pool) @@ -546,22 +546,22 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['stratum'] stratum = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) morph = FakeChunkMorphology('chunk1') chunk1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk1.morph') pool.add(chunk1) morph = FakeChunkMorphology('chunk2') chunk2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk2.morph') pool.add(chunk2) morph = FakeChunkMorphology('chunk3') chunk3 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk3.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk3.morph') pool.add(chunk3) artifacts = self.resolver.resolve_artifacts(pool) @@ -596,14 +596,14 @@ class ArtifactResolverTests(unittest.TestCase): morph = FakeChunkMorphology('chunk') chunk = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'chunk.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) morph = FakeStratumMorphology( 'stratum', chunks=[('chunk-runtime', 'chunk', 'repo', 'ref')]) stratum = morphlib.source.Source( - 'repo', 'ref', 'sha1', morph, 'stratum.morph') + 'repo', 'ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) self.assertRaises( @@ -618,7 +618,7 @@ class ArtifactResolverTests(unittest.TestCase): chunks=[], build_depends=[('stratum2', 'repo', 'original/ref')]) stratum1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum1.morph') pool.add(stratum1) morph = FakeStratumMorphology( @@ -626,7 +626,7 @@ class ArtifactResolverTests(unittest.TestCase): chunks=[], build_depends=[('stratum1', 'repo', 'original/ref')]) stratum2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum2.morph') pool.add(stratum2) self.assertRaises(morphlib.artifactresolver.MutualDependencyError, @@ -642,7 +642,7 @@ class ArtifactResolverTests(unittest.TestCase): ('chunk2', 'chunk2', 'repo', 'original/ref') ]) stratum1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum1.morph') pool.add(stratum1) morph = FakeStratumMorphology( @@ -653,17 +653,17 @@ class ArtifactResolverTests(unittest.TestCase): ], build_depends=[('stratum1', 'repo', 'original/ref')]) stratum2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum2.morph') pool.add(stratum2) morph = FakeChunkMorphology('chunk1') chunk1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk1.morph') pool.add(chunk1) morph = FakeChunkMorphology('chunk2') chunk2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk2.morph') pool.add(chunk2) self.assertRaises(morphlib.artifactresolver.MutualDependencyError, @@ -701,12 +701,12 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['stratum'] stratum = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) morph = FakeChunkMorphology('chunk') chunk = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) artifacts = self.resolver.resolve_artifacts(pool) @@ -750,17 +750,17 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['stratum'] stratum = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) morph = FakeChunkMorphology('chunk1') chunk1 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk1.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk1.morph') pool.add(chunk1) morph = FakeChunkMorphology('chunk2') chunk2 = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk2.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk2.morph') pool.add(chunk2) self.assertRaises(morphlib.artifactresolver.DependencyOrderError, @@ -786,12 +786,12 @@ class ArtifactResolverTests(unittest.TestCase): ''') morph.builds_artifacts = ['stratum'] stratum = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'stratum.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'stratum.morph') pool.add(stratum) morph = FakeChunkMorphology('chunk') chunk = morphlib.source.Source( - 'repo', 'original/ref', 'sha1', morph, 'chunk.morph') + 'repo', 'original/ref', 'sha1', 'tree', morph, 'chunk.morph') pool.add(chunk) self.assertRaises(morphlib.artifactresolver.DependencyFormatError, |