From 5239f5190ce326b891f4b69555f91a69b1a1a2ba Mon Sep 17 00:00:00 2001
From: Adam Coldrick <adam.coldrick@codethink.co.uk>
Date: Tue, 10 Mar 2015 10:13:15 +0000
Subject: Don't serialise the entire build graph

The controller no longer needs to know everything about an artifact
as the workers can calculate the build graph themselves quickly.

This reduces the amount of data which needs to be serialised by
serialise-artifact, making the yaml dump quicker.

Change-Id: I6bd0bed14c2efb2f499e9d6f0a97e6188353121a
---
 distbuild/serialise_tests.py | 77 +++++++++-----------------------------------
 1 file changed, 15 insertions(+), 62 deletions(-)

(limited to 'distbuild/serialise_tests.py')

diff --git a/distbuild/serialise_tests.py b/distbuild/serialise_tests.py
index a0ad78f8..2de3ab85 100644
--- a/distbuild/serialise_tests.py
+++ b/distbuild/serialise_tests.py
@@ -20,32 +20,6 @@ import unittest
 import distbuild
 
 
-class MockMorphology(object):
-
-    def __init__(self, name, kind):
-        self.dict = {
-            'name': '%s.morphology.name' % name,
-            'kind': kind,
-            'chunks': [],
-            'products': [
-                {
-                    'artifact': name,
-                    'include': [r'.*'],
-                },
-            ],
-        }
-
-    @property
-    def needs_artifact_metadata_cached(self):
-        return self.dict['kind'] == 'stratum'
-        
-    def keys(self):
-        return self.dict.keys()
-        
-    def __getitem__(self, key):
-        return self.dict[key]
-
-
 class MockSource(object):
 
     build_mode = 'staging'
@@ -57,7 +31,7 @@ class MockSource(object):
         self.original_ref = '%s.source.original_ref' % name
         self.sha1 = '%s.source.sha1' % name
         self.tree = '%s.source.tree' % name
-        self.morphology = MockMorphology(name, kind)
+        self.morphology = {'kind': kind}
         self.filename = '%s.source.filename' % name
         self.dependencies = []
         self.cache_id = {
@@ -78,6 +52,11 @@ class MockArtifact(object):
         self.name = name
         self.dependents = []
 
+    def basename(self):
+        return '%s.%s.%s' % (self.source.cache_key,
+                             self.source.morphology['kind'],
+                             self.name)
+
     def walk(self): # pragma: no cover
         done = set()
         
@@ -100,53 +79,28 @@ class SerialisationTests(unittest.TestCase):
         self.art3 = MockArtifact('name3', 'chunk')
         self.art4 = MockArtifact('name4', 'chunk')
 
-    def assertEqualMorphologies(self, a, b):
-        self.assertEqual(sorted(a.keys()), sorted(b.keys()))
-        keys = sorted(a.keys())
-        a_values = [a[k] for k in keys]
-        b_values = [b[k] for k in keys]
-        self.assertEqual(a_values, b_values)
-        self.assertEqual(a.needs_artifact_metadata_cached, 
-                         b.needs_artifact_metadata_cached)
-
-    def assertEqualSources(self, a, b):
-        self.assertEqual(a.repo, b.repo)
-        self.assertEqual(a.repo_name, b.repo_name)
-        self.assertEqual(a.original_ref, b.original_ref)
-        self.assertEqual(a.sha1, b.sha1)
-        self.assertEqual(a.tree, b.tree)
-        self.assertEqualMorphologies(a.morphology, b.morphology)
-        self.assertEqual(a.filename, b.filename)
-
-    def assertEqualArtifacts(self, a, b):
-        self.assertEqualSources(a.source, b.source)
-        self.assertEqual(a.name, b.name)
-        self.assertEqual(a.source.cache_id, b.source.cache_id)
-        self.assertEqual(a.source.cache_key, b.source.cache_key)
-        self.assertEqual(len(a.source.dependencies),
-                         len(b.source.dependencies))
-        for i in range(len(a.source.dependencies)):
-            self.assertEqualArtifacts(a.source.dependencies[i],
-                                      b.source.dependencies[i])
-
     def verify_round_trip(self, artifact):
-        encoded = distbuild.serialise_artifact(artifact)
+        encoded = distbuild.serialise_artifact(artifact,
+                                               artifact.source.repo_name,
+                                               artifact.source.sha1)
         decoded = distbuild.deserialise_artifact(encoded)
-        self.assertEqualArtifacts(artifact, decoded)
+        self.assertEqual(artifact.basename(), decoded.basename())
         
         objs = {}
         queue = [decoded]
         while queue:
             obj = queue.pop()
-            k = obj.source.cache_key
+            k = obj.cache_key
             if k in objs:
                 self.assertTrue(obj is objs[k])
             else:
                 objs[k] = obj
-            queue.extend(obj.source.dependencies)
+            queue.extend(obj.dependencies)
 
     def test_returns_string(self):
-        encoded = distbuild.serialise_artifact(self.art1)
+        encoded = distbuild.serialise_artifact(self.art1,
+                                               self.art1.source.repo_name,
+                                               self.art1.source.sha1)
         self.assertEqual(type(encoded), str)
 
     def test_works_without_dependencies(self):
@@ -170,4 +124,3 @@ class SerialisationTests(unittest.TestCase):
         self.art3.source.dependencies = [self.art4]
         self.art1.source.dependencies = [self.art2, self.art3]
         self.verify_round_trip(self.art1)
-
-- 
cgit v1.2.1