Add original_name member to CachedRepo. Use it for SourcePool lookups.

This is done to avoid a nasty mix of SourcePool lookups using CachedRepo
objects (e.g. for strata within a system) versus lookups using repo names
(e.g for sources within a stratum).

1 files changed, 9 insertions, 4 deletions

diff --git a/morphlib/sourcepool_tests.py b/morphlib/sourcepool_tests.py
index 5ed5be4d..60f09dfc 100644
--- a/morphlib/sourcepool_tests.py
+++ b/morphlib/sourcepool_tests.py
@@ -22,7 +22,8 @@ import morphlib
 class DummySource(object):
 
     def __init__(self):
-        self.repo = 'dummy.repo'
+        self.repo = morphlib.cachedrepo.CachedRepo(
+                'repo', 'repo url', 'repo path')
         self.original_ref = 'original/ref'
         self.sha1 = 'dummy.sha1'
         self.filename = 'dummy.morph'
@@ -47,13 +48,17 @@ class SourcePoolTests(unittest.TestCase):
 
     def test_looks_up_source(self):
         self.pool.add(self.source)
-        result = self.pool.lookup(self.source.repo, self.source.original_ref,
+        result = self.pool.lookup(self.source.repo.original_name,
+                                  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.original_ref, self.source.filename)
+        self.assertRaises(KeyError,
+                          self.pool.lookup,
+                          self.source.repo.original_name,
+                          self.source.original_ref,
+                          self.source.filename)
 
     def test_iterates_in_add_order(self):
         sources = []