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, 44 insertions, 42 deletions

diff --git a/morphlib/artifactresolver_tests.py b/morphlib/artifactresolver_tests.py
index d77ff5bb..eba8c80a 100644
--- a/morphlib/artifactresolver_tests.py
+++ b/morphlib/artifactresolver_tests.py
@@ -94,6 +94,8 @@ class FakeStratumMorphology(morphlib.morph2.Morphology):
 class ArtifactResolverTests(unittest.TestCase):
 
     def setUp(self):
+        self.repo = morphlib.cachedrepo.CachedRepo(
+                'repo', 'git://foo.bar/repo.git', '/foo/bar/repo')
         self.cache_key_computer = FakeCacheKeyComputer()
         self.resolver = morphlib.artifactresolver.ArtifactResolver(
                 self.cache_key_computer)
@@ -108,7 +110,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk')
         source = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(source)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -126,7 +128,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk', ['chunk-runtime'])
         source = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(source)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -143,7 +145,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk', ['chunk-runtime', 'chunk-devel'])
         source = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(source)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -173,7 +175,7 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         stratum = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'foo.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'foo.morph')
         pool.add(stratum)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -195,7 +197,7 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         system = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'foo.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'foo.morph')
         pool.add(system)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -211,13 +213,13 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk')
         chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         morph = FakeStratumMorphology(
                 'stratum', [('chunk', 'chunk', 'repo', 'ref')])
         stratum = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -241,7 +243,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk', ['chunk-devel', 'chunk-runtime'])
         chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         morph = FakeStratumMorphology(
@@ -250,7 +252,7 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk-runtime', 'chunk', 'repo', 'ref')
                 ])
         stratum = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -281,7 +283,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk', ['chunk-devel', 'chunk-runtime'])
         chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         morph = FakeStratumMorphology(
@@ -289,7 +291,7 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk-runtime', 'chunk', 'repo', 'ref')
                 ])
         stratum = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -313,12 +315,12 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('foo')
         foo_chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'foo.morph')
+                self.repo, 'ref', 'sha1', morph, 'foo.morph')
         pool.add(foo_chunk)
 
         morph = FakeChunkMorphology('bar')
         bar_chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'bar.morph')
+                self.repo, 'ref', 'sha1', morph, 'bar.morph')
         pool.add(bar_chunk)
 
         morph = FakeStratumMorphology(
@@ -327,7 +329,7 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('bar', 'bar', 'repo', 'ref')
                 ])
         stratum = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -358,12 +360,12 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeStratumMorphology('stratum1')
         stratum1 = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum1.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum1.morph')
         pool.add(stratum1)
 
         morph = FakeStratumMorphology('stratum2', [], ['stratum1'])
         stratum2 = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum2.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum2.morph')
         pool.add(stratum2)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -387,7 +389,7 @@ class ArtifactResolverTests(unittest.TestCase):
 
         morph = FakeStratumMorphology('stratum1')
         stratum1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum1.morph')
         pool.add(stratum1)
 
         morph = FakeStratumMorphology(
@@ -396,17 +398,17 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk2', 'chunk2', 'repo', 'original/ref')
                 ], ['stratum1'])
         stratum2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum2.morph')
         pool.add(stratum2)
 
         morph = FakeChunkMorphology('chunk1')
         chunk1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk1.morph')
         pool.add(chunk1)
 
         morph = FakeChunkMorphology('chunk2')
         chunk2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk2.morph')
         pool.add(chunk2)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -445,7 +447,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeStratumMorphology('stratum1')
         stratum1 = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum1.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum1.morph')
         pool.add(stratum1)
 
         morph = morphlib.morph2.Morphology(
@@ -460,12 +462,12 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         system = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'system.morph')
+                self.repo, 'ref', 'sha1', morph, 'system.morph')
         pool.add(system)
 
         morph = FakeStratumMorphology('stratum2', [], ['stratum1'])
         stratum2 = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum2.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum2.morph')
         pool.add(stratum2)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -525,22 +527,22 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         stratum = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         morph = FakeChunkMorphology('chunk1')
         chunk1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk1.morph')
         pool.add(chunk1)
 
         morph = FakeChunkMorphology('chunk2')
         chunk2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk2.morph')
         pool.add(chunk2)
 
         morph = FakeChunkMorphology('chunk3')
         chunk3 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk3.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk3.morph')
         pool.add(chunk3)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -579,7 +581,7 @@ class ArtifactResolverTests(unittest.TestCase):
         
         morph = FakeChunkMorphology('chunk')
         chunk = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         morph = FakeStratumMorphology(
@@ -587,7 +589,7 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk-runtime', 'chunk', 'repo', 'ref')
                 ])
         stratum = morphlib.source.Source(
-                'repo', 'ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         self.assertRaises(
@@ -599,12 +601,12 @@ class ArtifactResolverTests(unittest.TestCase):
 
         morph = FakeStratumMorphology('stratum1', [], ['stratum2'])
         stratum1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum1.morph')
         pool.add(stratum1)
 
         morph = FakeStratumMorphology('stratum2', [], ['stratum1'])
         stratum2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum2.morph')
         pool.add(stratum2)
 
         self.assertRaises(morphlib.artifactresolver.MutualDependencyError,
@@ -619,7 +621,7 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk2', 'chunk2', 'repo', 'original/ref')
                 ], [])
         stratum1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum1.morph')
         pool.add(stratum1)
 
         morph = FakeStratumMorphology(
@@ -628,17 +630,17 @@ class ArtifactResolverTests(unittest.TestCase):
                     ('chunk1', 'chunk1', 'repo', 'original/ref')
                 ], ['stratum1'])
         stratum2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum2.morph')
         pool.add(stratum2)
 
         morph = FakeChunkMorphology('chunk1')
         chunk1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk1.morph')
         pool.add(chunk1)
 
         morph = FakeChunkMorphology('chunk2')
         chunk2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk2.morph')
         pool.add(chunk2)
 
         self.assertRaises(morphlib.artifactresolver.MutualDependencyError,
@@ -675,12 +677,12 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         stratum = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         morph = FakeChunkMorphology('chunk')
         chunk = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         artifacts = self.resolver.resolve_artifacts(pool)
@@ -725,17 +727,17 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         stratum = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         morph = FakeChunkMorphology('chunk1')
         chunk1 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk1.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk1.morph')
         pool.add(chunk1)
 
         morph = FakeChunkMorphology('chunk2')
         chunk2 = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk2.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk2.morph')
         pool.add(chunk2)
 
         self.assertRaises(morphlib.artifactresolver.DependencyOrderError,
@@ -760,12 +762,12 @@ class ArtifactResolverTests(unittest.TestCase):
                 }
                 ''')
         stratum = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'stratum.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'stratum.morph')
         pool.add(stratum)
 
         morph = FakeChunkMorphology('chunk')
         chunk = morphlib.source.Source(
-                'repo', 'original/ref', 'sha1', morph, 'chunk.morph')
+                self.repo, 'original/ref', 'sha1', morph, 'chunk.morph')
         pool.add(chunk)
 
         self.assertRaises(morphlib.artifactresolver.DependencyFormatError,