From 5c395fa2eef5db538c266085dd8f970a3883dd7c Mon Sep 17 00:00:00 2001 From: Richard Ipsum Date: Sun, 5 Oct 2014 20:25:05 +0100 Subject: Update artifact resolver and ckc tests The original resolve_artifacts method is essentially unchanged, it's just private now. This means that aside from this name change the tests remain the same. --- morphlib/artifactresolver_tests.py | 16 ++++++++-------- morphlib/cachekeycomputer_tests.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/morphlib/artifactresolver_tests.py b/morphlib/artifactresolver_tests.py index 89f30010..b958da4f 100644 --- a/morphlib/artifactresolver_tests.py +++ b/morphlib/artifactresolver_tests.py @@ -82,7 +82,7 @@ class ArtifactResolverTests(unittest.TestCase): def test_resolve_artifacts_using_an_empty_pool(self): pool = morphlib.sourcepool.SourcePool() - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) self.assertEqual(len(artifacts), 0) def test_resolve_single_chunk_with_no_subartifacts(self): @@ -95,7 +95,7 @@ class ArtifactResolverTests(unittest.TestCase): for source in sources: pool.add(source) - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) self.assertEqual(len(artifacts), sum(len(s.split_rules.artifacts) for s in pool)) @@ -116,7 +116,7 @@ class ArtifactResolverTests(unittest.TestCase): for source in sources: pool.add(source) - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) self.assertEqual(len(artifacts), sum(len(s.split_rules.artifacts) for s in pool)) @@ -136,7 +136,7 @@ class ArtifactResolverTests(unittest.TestCase): for source in sources: pool.add(source) - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) artifacts.sort(key=lambda a: a.name) self.assertEqual(len(artifacts), @@ -167,7 +167,7 @@ class ArtifactResolverTests(unittest.TestCase): for stratum in stratum_sources: pool.add(stratum) - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) all_artifacts = set() for s in pool: all_artifacts.update(s.split_rules.artifacts) @@ -216,7 +216,7 @@ class ArtifactResolverTests(unittest.TestCase): for stratum in stratum_sources: pool.add(stratum) - artifacts = self.resolver.resolve_artifacts(pool) + artifacts = self.resolver._resolve_artifacts(pool) self.assertEqual( set(artifacts), @@ -278,7 +278,7 @@ class ArtifactResolverTests(unittest.TestCase): pool.add(stratum2) self.assertRaises(morphlib.artifactresolver.MutualDependencyError, - self.resolver.resolve_artifacts, pool) + self.resolver._resolve_artifacts, pool) def test_detection_of_chunk_dependencies_in_invalid_order(self): pool = morphlib.sourcepool.SourcePool() @@ -321,7 +321,7 @@ class ArtifactResolverTests(unittest.TestCase): pool.add(chunk2) self.assertRaises(morphlib.artifactresolver.DependencyOrderError, - self.resolver.resolve_artifacts, pool) + self.resolver._resolve_artifacts, pool) # TODO: Expand test suite to include better dependency checking, many diff --git a/morphlib/cachekeycomputer_tests.py b/morphlib/cachekeycomputer_tests.py index 55936f94..57739983 100644 --- a/morphlib/cachekeycomputer_tests.py +++ b/morphlib/cachekeycomputer_tests.py @@ -99,7 +99,7 @@ class CacheKeyComputerTests(unittest.TestCase): "USER": "foouser", "USERNAME": "foouser"}, 'dummy') self.artifact_resolver = morphlib.artifactresolver.ArtifactResolver() - self.artifacts = self.artifact_resolver.resolve_artifacts( + self.artifacts = self.artifact_resolver._resolve_artifacts( self.source_pool) self.ckc = morphlib.cachekeycomputer.CacheKeyComputer(self.build_env) -- cgit v1.2.1