Merge lp:~jamestait/pkgme-service/snappy-packages-have-snap-extension into lp:pkgme-service

[James Tait]

Detect whether the scanned package is a Snappy package, and return the is_snappy flag to SCA.

This branch looks in the scanned package for the presence of the
meta/package.yaml file, indicating that this is a Snappy package, and sets the
is_snap in the metadata response accordingly.

[James Westby (james-w)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2014-05-02 18:21:36 +0000
+++ .bzrignore	2014-12-15 17:35:33 +0000
@@ -12,3 +12,4 @@
 src/django_pkgme.egg-info/
 test.db
 env/
+tags

=== modified file 'requirements/test.txt'
--- requirements/test.txt	2014-05-05 18:38:10 +0000
+++ requirements/test.txt	2014-12-15 17:35:33 +0000
@@ -8,6 +8,7 @@
 pyflakes
 testresources==0.2.5
 txpkgme==0.3
+PyYAML
 
 -e bzr+ssh://bazaar.launchpad.net/+branch/django-pgtools#egg=django-pgtools
 -e bzr+ssh://bazaar.launchpad.net/+branch/libdep-service#egg=libdep-service

=== modified file 'src/djpkgme/tasks.py'
--- src/djpkgme/tasks.py	2014-11-26 20:25:45 +0000
+++ src/djpkgme/tasks.py	2014-12-15 17:35:33 +0000
@@ -374,7 +374,7 @@
             return results
 
     def process_unpacked(self, metadata, unpacked, unpack_result, logger):
-        return [self.get_package_info(unpacked, logger)]
+        return [self.get_package_info(unpacked, logger), self.get_extra_info(unpacked, logger)]
 
     def get_package_architectures(self, package):
         prefix = 'Architecture:'
@@ -439,6 +439,12 @@
                                                      logger)
         return manifest
 
+    def get_extra_info(self, package, logger):
+        extra_info = {}
+        extra_info['is_snap'] = os.path.exists(
+            os.path.join(package, 'meta', 'package.yaml'))
+        return extra_info
+
 
 class ClickPackageReviewJob(ClickPackageJob):
     CLICK_CHECKS = ['lint', 'content-hub', 'desktop', 'functional',

=== modified file 'src/djpkgme/tests/test_tasks.py'
--- src/djpkgme/tests/test_tasks.py	2014-11-26 20:56:07 +0000
+++ src/djpkgme/tests/test_tasks.py	2014-12-15 17:35:33 +0000
@@ -9,6 +9,7 @@
 import sys
 import tarfile
 import traceback
+import yaml
 
 from celery.exceptions import MaxRetriesExceededError
 from devportalbinary.metadata import MetadataBackend
@@ -757,6 +758,17 @@
         with open(os.path.join(debian_dir, 'control'), 'w') as f:
             f.write(control_content)
 
+    def make_snappy_manifest(self, manifest_content, directory, raw=False):
+        meta_dir = os.path.join(directory, 'meta')
+        if not os.path.exists(meta_dir):
+            os.mkdir(meta_dir)
+        with open(os.path.join(meta_dir, 'package.yaml'), 'w') as f:
+            if raw:
+                content = manifest_content
+            else:
+                content = yaml.dump(manifest_content, default_flow_style=False)
+            f.write(content)
+
     def test_get_package_architectures(self):
         job = ClickPackageInfoJob()
         tempdir = self.useFixture(TempDir()).path
@@ -956,9 +968,7 @@
 
         self.assertFalse(mock_process_unpacked.called)
 
-    @patch('djpkgme.tasks.subprocess.check_output')
-    @patch('djpkgme.tasks.TempDir')
-    def test_integration(self, mock_tempdir, mock_call):
+    def _assert_integration_succeeds(self, mock_tempdir, mock_call, snappy):
         tempdir = self.useFixture(TempDir())
         downloaded_path = os.path.join(tempdir.path,
                                        'apackage_1.0_amd64.click')
@@ -973,6 +983,11 @@
             name=package_fullname,
             icon='path/to/icon.png'),
             unpacked_path)
+        if snappy:
+            self.make_snappy_manifest(dict(
+                name=package_fullname,
+                icon='path/to/icon.png'),
+                unpacked_path)
         self.make_control_file('Architecture: all', unpacked_path)
 
         mock_tempdir.return_value = self.make_tempdir_fixture_mock(
@@ -984,8 +999,8 @@
         mock_call.assert_called_with(
             ['dpkg-deb', '-R', downloaded_path, unpacked_path],
             stderr=subprocess.STDOUT)
-        self.assertEqual(2, len(results))
-        checks, metadata = results
+        self.assertEqual(3, len(results))
+        checks, metadata, extra_info = results
         # there are no errors
         self.assertEqual(0, len(checks['warn']))
         self.assertEqual(0, len(checks['error']))
@@ -1000,6 +1015,18 @@
                 'filename': 'icon.png',
                 'data': None,
             }}, metadata)
+        # and that the package isn't a snap
+        self.assertEqual(snappy, extra_info['is_snap'])
+
+    @patch('djpkgme.tasks.subprocess.check_output')
+    @patch('djpkgme.tasks.TempDir')
+    def test_integration(self, mock_tempdir, mock_call):
+        self._assert_integration_succeeds(mock_tempdir, mock_call, False)
+
+    @patch('djpkgme.tasks.subprocess.check_output')
+    @patch('djpkgme.tasks.TempDir')
+    def test_snappy_integration(self, mock_tempdir, mock_call):
+        self._assert_integration_succeeds(mock_tempdir, mock_call, False)
 
 
 class TestClickPackageReviewJob(ClickPackageJobTestCase):