Merge lp:~cprov/snappy-proposed-selftest-agent/source-binaries into lp:snappy-proposed-selftest-agent

[Celso Providelo]

Using 'source_binaries' payload provided by Britney.

Using 'source_binaries' payload provided by Britney from https://code.launchpad.net/~cprov/britney/source-binaries/+merge/260540

[lp:~cprov/snappy-proposed-selftest-agent/source-binaries]

15. By Celso Providelo on 2015-05-29

Including 'image_binaries' in the payload, to be zipped with 'source_version' in the image-builder to ensure the rootfs contains the required binaries for this test.

[Paul Larson (pwlars)]

This looks great, thanks! +1

review: Approve

=== modified file 'snappy_proposed_selftest_agent/tests/test_worker.py'
--- snappy_proposed_selftest_agent/tests/test_worker.py	2015-05-29 01:57:53 +0000
+++ snappy_proposed_selftest_agent/tests/test_worker.py	2015-05-29 13:41:36 +0000
@@ -29,7 +29,7 @@
         mock_fetch_manifest.return_value = {}
         conn = kombu.Connection('memory:///')
         queue_message(conn, {'test': 'value',
-                             'source_name': 'foo',
+                             'source_binaries': ['foo'],
                              'series': 'wily'})
 
         build_worker = LoggingConsumer()
@@ -43,9 +43,15 @@
 
     @mock.patch.object(CoreSelftestAgentWorker, '_fetch_manifest')
     def test_package_in_manifest(self, mock_fetch_manifest):
-        mock_fetch_manifest.return_value = {'foo': '1.0'}
+        mock_fetch_manifest.return_value = {
+            'foo': '1.0',
+            'bar': '1.0',
+        }
         conn = kombu.Connection('memory:///')
-        queue_message(conn, {'source_name': 'foo', 'series': 'wily'})
+        queue_message(conn, {
+            'source_binaries': ['foo', 'bar', 'baz'],
+            'series': 'wily',
+        })
         build_worker = LoggingConsumer()
         result_worker = LoggingConsumer()
         config = read_config()
@@ -56,6 +62,13 @@
             build_worker.messages_seen[0].get('test_name'), 'snappy-selftest')
         self.assertEqual(
             result_worker.messages_seen[0].get('test_name'), 'snappy-selftest')
+        # 'image_binaries' payload contains a list of binaries produced
+        # by the source candidate and mentioned on the image manifest. It
+        # should be zipped with the 'source_version' to ensure the correct
+        # binaries are installed in the testing 'rootfs'.
+        self.assertEqual(
+            ['foo', 'bar'],
+            build_worker.messages_seen[0].get('image_binaries'))
 
 
 class LoggingConsumer(object):
 
=== modified file 'snappy_proposed_selftest_agent/worker.py'
--- snappy_proposed_selftest_agent/worker.py	2015-05-29 02:07:03 +0000
+++ snappy_proposed_selftest_agent/worker.py	2015-05-29 13:41:36 +0000
@@ -62,30 +62,29 @@
                          extra=constants.LOGGING_EXTRA)
             return None
 
-    def check_package(self, body):
-        """Check if we need to handle this package or not."""
-
-        release = constants.RELEASE_MAP[constants.RELEASE]
-        source_series = body['series']
-        source_name = body['source_name']
-        arch = constants.ARCH
-
-        if source_series != release:
-            # This is not the series we are looking for
-            return False
-
-        manifest = self._fetch_manifest(release, arch)
-        if source_name in manifest:
-            # This package is one we need to test
-            return True
-        else:
-            return False
+    def get_manifest_binaries(self, binaries, series, arch):
+        """Yields binary names mentioned in the corresponding manifest."""
+        manifest = self._fetch_manifest(series, arch)
+        for binary in binaries:
+            if binary in manifest:
+                yield binary
 
     def process(self, body, message):
         """ Process incoming messages about candidate packages """
+        # Dismiss if it's not the series (derived from ubuntu 'release')
+        # this agent cares about.
+        context_series = constants.RELEASE_MAP[constants.RELEASE]
+        if context_series != body['series']:
+            message.ack()
+            return
 
-        if not self.check_package(body):
-            # If we don't have this package in our channel/image, just exit
+        # If no binaries produced by the source candidate are mentioned
+        # in the image manifest, it does not need testing.
+        image_binaries = list(
+            self.get_manifest_binaries(
+                body['source_binaries'], context_series, constants.ARCH)
+        )
+        if not image_binaries:
             message.ack()
             return
 
@@ -101,6 +100,7 @@
             'channel': constants.CHANNEL,
             'release': constants.RELEASE,
             'device': constants.DEVICE,
+            'image_binaries': image_binaries,
             'test_name': constants.TEST_NAME,
             'test_status': 'RUNNING',
             # XXX cprov 20150528: this context can't possibly set the