Merge branch 'baserock/richardmaw-os/tidy-build-logic-v7'

Reviewed-by: Lars Wirzenius (+2 to misc fixups)
Reviewed-by: Sam Thursfield (+1 to per-source building)
Reviewed-by: Paul Sherwood  (+1 to per-source building)

1 files changed, 2 insertions, 36 deletions

diff --git a/morphlib/builder2_tests.py b/morphlib/builder2_tests.py
index d0d56b17..4fd0807a 100644
--- a/morphlib/builder2_tests.py
+++ b/morphlib/builder2_tests.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013  Codethink Limited
+# Copyright (C) 2012-2014  Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -48,6 +48,7 @@ class FakeSource(object):
             'kind': 'b',
             'description': 'c',
         }
+        self.name = 'a'
 
         self.repo = morphlib.cachedrepo.CachedRepo(FakeApp(), 'repo',
                                                    'url', 'path')
@@ -162,45 +163,10 @@ class BuilderBaseTests(unittest.TestCase):
                                                      self.max_jobs,
                                                      False)
 
-    def test_returns_an_artifact(self):
-        artifact = self.builder.new_artifact('le-artifact')
-        self.assertEqual(type(artifact), morphlib.artifact.Artifact)
-
     def test_runs_desired_command(self):
         self.builder.runcmd(['foo', 'bar'])
         self.assertEqual(self.commands_run, [['foo', 'bar']])
 
-    def test_creates_metadata_with_required_fields(self):
-        artifact_name = 'le-artifact'
-        source = self.artifact.source
-        morphology = source.morphology
-        meta = self.builder.create_metadata(artifact_name)
-        self.assertEqual(meta['artifact-name'], artifact_name)
-        self.assertEqual(meta['source-name'], morphology['name'])
-        self.assertEqual(meta['kind'], morphology['kind'])
-        self.assertEqual(meta['description'], morphology['description'])
-        self.assertEqual(meta['repo'], source.repo.url)
-        self.assertEqual(meta['original_ref'], source.original_ref)
-        self.assertEqual(meta['sha1'], source.sha1)
-        self.assertEqual(meta['morphology'], source.filename)
-
-    def test_writes_metadata(self):
-        artifact_name = 'le-artifact'
-        orig_meta = self.builder.create_metadata(artifact_name)
-
-        instdir = '/inst/dir'
-
-        self.builder._open = self.fake_open
-        self.builder.write_metadata(instdir, artifact_name)
-
-        self.assertTrue(self.open_filename.startswith(
-                        os.path.join(instdir, 'baserock',
-                                     artifact_name + '.')))
-        self.assertTrue(self.open_filename.endswith('.meta'))
-
-        meta = json.loads(self.open_handle.getvalue())
-        self.assertEqual(meta, orig_meta)
-
     def test_writes_build_times(self):
         with self.builder.build_watch('nothing'):
             pass