diff options
| author | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-04-18 16:49:24 +0100 |
|---|---|---|
| committer | Jannis Pohlmann <jannis.pohlmann@codethink.co.uk> | 2012-04-18 16:49:24 +0100 |
| commit | 105c0dbbd14626a832ebc036c02bc0c9c60e43bc (patch) | |
| tree | 9e9398e9e4d4bc8da54a63094142f941b881419e /morphlib/buildorder_tests.py | |
| parent | 605e21914f8c9536ff42ca31043b26200dab85e2 (diff) | |
| download | morph-105c0dbbd14626a832ebc036c02bc0c9c60e43bc.tar.gz | |
Remove BuildGraph, compute cache keys based on Artifacts.
With this commit, the ArtifactResolver no longer computes the cache keys
when creating Artifact objects. This will have to happen as a
post-resolving step (e.g. prior to building or checking whether a local
or remote artifact cache has any of the resolved artifacts).
The CacheKeyComputer now takes an Artifact object and computes the cache
keys using its dependencies.
BuildGraph is no longer needed for the CacheKeyComputer unit tests.
Diffstat (limited to 'morphlib/buildorder_tests.py')
| -rw-r--r-- | morphlib/buildorder_tests.py | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/morphlib/buildorder_tests.py b/morphlib/buildorder_tests.py index 67fbdf4f..32a14120 100644 --- a/morphlib/buildorder_tests.py +++ b/morphlib/buildorder_tests.py @@ -31,7 +31,7 @@ class BuildOrderTests(unittest.TestCase): def test_list_with_one_artifact_results_in_one_group(self): chunk = FakeSource() - artifact = morphlib.artifact.Artifact(chunk, 'chunk', 'key') + artifact = morphlib.artifact.Artifact(chunk, 'chunk') order = morphlib.buildorder.BuildOrder([artifact]) @@ -40,10 +40,10 @@ class BuildOrderTests(unittest.TestCase): def test_list_with_two_unrelated_artifacts_results_in_one_group(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') order = morphlib.buildorder.BuildOrder([artifact1, artifact2]) @@ -52,10 +52,10 @@ class BuildOrderTests(unittest.TestCase): def test_list_with_two_dependent_artifacts_results_in_two_groups(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') artifact2.add_dependency(artifact1) order = morphlib.buildorder.BuildOrder([artifact1, artifact2]) @@ -66,14 +66,14 @@ class BuildOrderTests(unittest.TestCase): def test_chain_of_three_dependent_artifacts_results_in_three_groups(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') artifact2.add_dependency(artifact1) chunk3 = FakeSource() - artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3', 'key3') + artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3') artifact3.add_dependency(artifact2) order = morphlib.buildorder.BuildOrder( @@ -86,14 +86,14 @@ class BuildOrderTests(unittest.TestCase): def test_two_artifacts_depending_on_another_results_in_two_groups(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') artifact2.add_dependency(artifact1) chunk3 = FakeSource() - artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3', 'key3') + artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3') artifact3.add_dependency(artifact1) order = morphlib.buildorder.BuildOrder( @@ -105,13 +105,13 @@ class BuildOrderTests(unittest.TestCase): def test_one_artifact_depending_on_two_others_results_in_two_groups(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') chunk3 = FakeSource() - artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3', 'key3') + artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3') artifact3.add_dependency(artifact1) artifact3.add_dependency(artifact2) @@ -124,13 +124,13 @@ class BuildOrderTests(unittest.TestCase): def test_detection_of_cyclic_dependency_chain(self): chunk1 = FakeSource() - artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1', 'key1') + artifact1 = morphlib.artifact.Artifact(chunk1, 'chunk1') chunk2 = FakeSource() - artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2', 'key2') + artifact2 = morphlib.artifact.Artifact(chunk2, 'chunk2') chunk3 = FakeSource() - artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3', 'key3') + artifact3 = morphlib.artifact.Artifact(chunk3, 'chunk3') artifact1.add_dependency(artifact3) artifact2.add_dependency(artifact1) |