From 5afd3d7ce64b762acb228f7f6b4f0326d030807b Mon Sep 17 00:00:00 2001 From: Jannis Pohlmann Date: Wed, 11 Apr 2012 13:15:31 +0100 Subject: Add original_ref member to Source. Default to None for build-depends. We will almost always want to look up sources based on the data we find in morphologies (e.g. chunk sources found in a stratum or strata found in a system). For that we need to remember the original_ref in addition to the resolved SHA1 and look up sources using this original ref. The original ref is therefore also used as part of the hash key in SourcePool now. --- morphlib/sourcepool_tests.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'morphlib/sourcepool_tests.py') diff --git a/morphlib/sourcepool_tests.py b/morphlib/sourcepool_tests.py index 35a94b39..5ed5be4d 100644 --- a/morphlib/sourcepool_tests.py +++ b/morphlib/sourcepool_tests.py @@ -23,6 +23,7 @@ class DummySource(object): def __init__(self): self.repo = 'dummy.repo' + self.original_ref = 'original/ref' self.sha1 = 'dummy.sha1' self.filename = 'dummy.morph' self.morphology = {} @@ -46,13 +47,13 @@ class SourcePoolTests(unittest.TestCase): def test_looks_up_source(self): self.pool.add(self.source) - result = self.pool.lookup(self.source.repo, self.source.sha1, + result = self.pool.lookup(self.source.repo, self.source.original_ref, self.source.filename) self.assertEqual(result, self.source) def test_lookup_raises_keyerror_if_not_found(self): self.assertRaises(KeyError, self.pool.lookup, self.source.repo, - self.source.sha1, self.source.filename) + self.source.original_ref, self.source.filename) def test_iterates_in_add_order(self): sources = [] -- cgit v1.2.1