summaryrefslogtreecommitdiff
path: root/morphlib/cachekeycomputer_tests.py
diff options
context:
space:
mode:
authorJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-09-05 17:12:26 +0000
committerJannis Pohlmann <jannis.pohlmann@codethink.co.uk>2012-09-05 17:12:26 +0000
commitb9488584415d94fc28c2e064b917183b851af07b (patch)
treeebdb4f647c43afd633fcc5243e26ef24c6096628 /morphlib/cachekeycomputer_tests.py
parent083fd4de011e0fcf4a445b38a7fa6ef8964a5ccb (diff)
downloadmorph-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/cachekeycomputer_tests.py')
-rw-r--r--morphlib/cachekeycomputer_tests.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/cachekeycomputer_tests.py b/morphlib/cachekeycomputer_tests.py
index 7ace9c36..7077a313 100644
--- a/morphlib/cachekeycomputer_tests.py
+++ b/morphlib/cachekeycomputer_tests.py
@@ -91,7 +91,7 @@ class CacheKeyComputerTests(unittest.TestCase):
}''',
}.iteritems():
source = morphlib.source.Source(
- 'repo', 'original/ref', 'sha',
+ 'repo', 'original/ref', 'sha', 'tree',
morphlib.morph2.Morphology(text), name)
self.source_pool.add(source)
# FIXME: This should use MorphologyFactory
@@ -171,7 +171,7 @@ class CacheKeyComputerTests(unittest.TestCase):
old_artifact = self._find_artifact('system-rootfs')
morphology = old_artifact.source.morphology
new_source = morphlib.source.Source('repo', 'original/ref', 'newsha',
- morphology,
+ 'tree', morphology,
old_artifact.source.filename)
self.source_pool.add(new_source)
artifacts = self.artifact_resolver.resolve_artifacts(self.source_pool)