summaryrefslogtreecommitdiff
path: root/morphlib/builder2_tests.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-04-24 13:33:56 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-04-24 13:33:56 +0000
commit238b1a44bda17ce49f424c4d874e0dd74c29c5c8 (patch)
tree0858a09e7ea58c19ae9e995348cffb8b63155d2b /morphlib/builder2_tests.py
parent87aa2c5a7c1f2cb0ca74959d5a082ccc80f6502a (diff)
parente335d4f25ff93ca3fba4c96d54131bbe1f646d3b (diff)
downloadmorph-238b1a44bda17ce49f424c4d874e0dd74c29c5c8.tar.gz
Merge remote-tracking branch 'origin/master' into rm/timings-back
Diffstat (limited to 'morphlib/builder2_tests.py')
-rw-r--r--morphlib/builder2_tests.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/morphlib/builder2_tests.py b/morphlib/builder2_tests.py
index e3f81d16..67379341 100644
--- a/morphlib/builder2_tests.py
+++ b/morphlib/builder2_tests.py
@@ -134,11 +134,13 @@ class BuilderBaseTests(unittest.TestCase):
self.staging_area = FakeStagingArea(self.fake_runcmd)
self.artifact_cache = FakeArtifactCache()
self.artifact = FakeArtifact('le-artifact')
+ self.repo_cache = None
self.build_env = FakeBuildEnv()
self.max_jobs = 1
self.builder = morphlib.builder2.BuilderBase(self.staging_area,
self.artifact_cache,
self.artifact,
+ self.repo_cache,
self.build_env,
self.max_jobs)
@@ -202,7 +204,8 @@ class BuilderBaseTests(unittest.TestCase):
class ChunkBuilderTests(unittest.TestCase):
def setUp(self):
- self.build = morphlib.builder2.ChunkBuilder(None, None, None, None, 1)
+ self.build = morphlib.builder2.ChunkBuilder(None, None, None, None,
+ None, 1)
def test_uses_morphology_commands_when_given(self):
m = { 'build-commands': ['build-it'] }