Merge lp:~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 into lp:click-reviewers-tools

[Jamie Strandboge]

This is a big branch to support all snaps and squashfs. In particular:

* add kernel and os as valid snap types
* remove package filename checks. They were meaningless and hard to maintain
* several changes for squashfs snaps that won't have a click manifest, etc.
  Importantly, this means that only package.yaml is looked at and a lot of
  click specific tests can be skipped
  - cr_common.py:
    + rename a few variable to not be click specific
    + add self.pkgfmt
    + adjust __init__() to conditionally use package.yaml on squashfs,
      otherwise click manifest
    + make click data structure initialization conditional on if click
      or not (eg, don't run hooks code on squashfs images)
  - adjust clickreviews/cr_* to conditionally run certain click-only tests
    on click packages
  - adjust architecture checks to use self.pkg_arch and rename
    control_architecture_specified_needed as architecture_specified_needed
  - cr_security.py:
    + revamp to use package.yaml on non-click instead of now nonexistent
      security manifest
    + update push-helper template test to not make hooks specific
    + network-client should not be allowed with push helpers either
    + conditionally look for INSTALL_DIR on 16.04 systems in security-policy
    + adjust security-override checks on 16.04 to follow 16.04 yaml
    + make click manifest checks conditional on if click
  - cr_tests.py: mock _pkgfmt_type(), _pkgfmt_version() and _is_squashfs()

Testing consisted of:
* comparing the output of 'click-review -v' on all clicks in the store with trunk and with this branch
* comparing the output of 'click-review -v' on all non-squashfs snaps in the store with trunk and with this branch
* comparing the output of 'click-review -v' on hello-world.canonial snap (click format) and hello-world.mvo snap (squashfs format) to make sure the correct tests are being run
* testing 'click-review -v' on all squashfs snaps

I don't necessarily expect people to go through this whole branch, but I wanted people to see it before committing. I'm going on holiday next week and will address feedback and pursue a store sync after that.

For those that want to test:
$ bzr branch lp:~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604 review-tools
$ cd ./review-tools
$ PYTHONPATH=./ ./bin/click-review -v /path/to/app

[lp:~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604]

576. By Jamie Strandboge on 2015-11-30

merge r551 from trunk: lp:~jamestait/click-reviewers-tools/add-askubuntu-links

577. By Jamie Strandboge on 2015-11-30

merge r552 from trunk: add changelog entry

578. By Jamie Strandboge on 2015-11-30

merge r553 from trunk: Allow "accounts" hook since the 15.04.1 framework

579. By Jamie Strandboge on 2015-12-01

Merge from trunk: Forbid the internal "DebugMode" scope.ini key from making its
way into the store (LP: #1511063)

[Jamie Strandboge (jdstrand)]

Ok, this has not received reviews but is well tested. It is important that this land sooner rather than later so committing. Please ping me if there are any issues and I'll sort them out immediately.

review: Approve

[lp:~jdstrand/click-reviewers-tools/click-reviewers-tools.snappy1604]

580. By Jamie Strandboge on 2015-12-01

clickreviews/tests/test_cr_scope.py: update for last commit

=== modified file 'check-names.list'
--- check-names.list	2015-12-01 14:44:03 +0000
+++ check-names.list	2015-12-01 15:03:49 +0000
@@ -44,9 +44,9 @@
 framework:policy_metadata|
 framework:policy_unknown|
 framework:policy_valid_name|
+lint:architecture_specified_needed|
 lint:click_local_extensions|
 lint:control_architecture_match|
-lint:control_architecture_specified_needed|
 lint:control_architecture_valid|
 lint:control_architecture_valid_contents|
 lint:control_click_version_up_to_date|http://askubuntu.com/questions/417366/what-does-lint-control-click-version-up-to-date-mean/417367
@@ -77,10 +77,6 @@
 lint:manifest_icon_absolute_path|
 lint:manifest_icon_empty|
 lint:manifest_icon_present|
-lint:package_filename_arch_match|
-lint:package_filename_arch_valid|http://askubuntu.com/questions/685103/what-does-lint-package-filename-arch-valid-mean/685104
-lint:package_filename_format|http://askubuntu.com/questions/685049/what-does-lint-package-filename-format-mean/685050
-lint:package_filename_version_match|http://askubuntu.com/questions/417384/what-does-lint-package-filename-version-match-mean/417385
 lint:package yaml_architecture_valid|
 lint:package_yaml_icon_absolute_path|
 lint:package_yaml_icon_empty|
@@ -153,7 +149,6 @@
 security:template_account_provider|
 security:template_account_qml_plugin|
 security:template_exists|
-security:template_push_helper|
 security:template_valid|http://askubuntu.com/q/671403
 security:template_with_policy_version|
 security:yaml_and_click|
@@ -163,6 +158,7 @@
 security:yaml_combinations|
 security:yaml_override_click|
 security:yaml_override_format|
+security:yaml_override_present|https://developer.ubuntu.com/en/snappy/guides/security-policy/
 security:yaml_policy_format|
 security:yaml_policy_present|https://developer.ubuntu.com/en/snappy/guides/security-policy/
 security:yaml_security-template|
 
=== modified file 'clickreviews/cr_common.py'
--- clickreviews/cr_common.py	2015-11-11 16:05:23 +0000
+++ clickreviews/cr_common.py	2015-12-01 15:03:49 +0000
@@ -96,9 +96,13 @@
                        "binaries",
                        "caps",
                        "config",
+                       "firmware",
                        "frameworks",
                        "icon",
                        "immutable-config",
+                       "initrd",
+                       "kernel",
+                       "modules",
                        "oem",
                        "services",
                        "source",
@@ -112,11 +116,11 @@
 
     def __init__(self, fn, review_type, peer_hooks=None, overrides=None,
                  peer_hooks_link=None):
-        self.click_package = fn
+        self.pkg_filename = fn
         self._check_path_exists()
-        if not self.click_package.endswith(".click") and \
-                not self.click_package.endswith(".snap"):
-            if self.click_package.endswith(".deb"):
+        if not self.pkg_filename.endswith(".click") and \
+                not self.pkg_filename.endswith(".snap"):
+            if self.pkg_filename.endswith(".deb"):
                 error("filename does not end with '.click', but '.deb' "
                       "instead. See http://askubuntu.com/a/485544/94326 for "
                       "how click packages are different.")
@@ -141,28 +145,29 @@
             RAW_UNPACK_DIR = raw_unpack_pkg(fn)
         self.raw_unpack_dir = RAW_UNPACK_DIR
 
-        # Get some basic information from the control file
-        control_file = self._extract_control_file()
-        tmp = list(Deb822.iter_paragraphs(control_file))
-        if len(tmp) != 1:
-            error("malformed control file: too many paragraphs")
-        control = tmp[0]
-        self.click_pkgname = control['Package']
-        self.click_version = control['Version']
-        self.click_arch = control['Architecture']
-
-        # Parse and store the manifest
-        manifest_json = self._extract_manifest_file()
-        try:
-            self.manifest = json.load(manifest_json)
-        except Exception:
-            error("Could not load manifest file. Is it properly formatted?")
-        self._verify_manifest_structure()
-
-        # Parse and store the package.yaml
+        self.pkgfmt = {"type": "", "version": ""}
+        self.manifest = None
+        self.click_pkgname = None
+        self.click_version = None
+        self.pkg_arch = []
+
+        # Parse and store the package.yaml, if it exists
         pkg_yaml = self._extract_package_yaml()
         self.is_snap = False
-        if pkg_yaml is not None:
+        if pkg_yaml is None:
+            self.pkgfmt["type"] = "click"
+        else:
+            self.pkgfmt["type"] = "snap"
+            # Some day we will be able to introspect the version, but not
+            # today.... For now, decide on if it is a squashfs and if so,
+            # assume it is 16.04
+            if is_squashfs(fn):
+                self.pkgfmt["version"] = "16.04"
+                self.peer_hooks = None
+                self.peer_hooks_link = None
+            else:
+                self.pkgfmt["version"] = "15.04"
+
             try:
                 self.pkg_yaml = yaml.safe_load(pkg_yaml)
             except Exception:
@@ -174,6 +179,45 @@
             if 'type' not in self.pkg_yaml:
                 self.pkg_yaml['type'] = 'app'
 
+            if 'architectures' in self.pkg_yaml:
+                self.pkg_arch = self.pkg_yaml['architectures']
+            elif 'architecture' in self.pkg_yaml:
+                if isinstance(self.pkg_yaml['architecture'], str):
+                    self.pkg_arch = [self.pkg_yaml['architecture']]
+                elif isinstance(self.pkg_yaml['architecture'], list):
+                    self.pkg_arch = self.pkg_yaml['architecture']
+                else:
+                    error("Could not load package.yaml: invalid 'architecture'")
+            else:
+                self.pkg_arch = ['all']
+
+        if self._pkgfmt_type() == "click" or self._pkgfmt_version() == "15.04":
+            # Get some basic information from the control file
+            control_file = self._extract_control_file()
+            tmp = list(Deb822.iter_paragraphs(control_file))
+            if len(tmp) != 1:
+                error("malformed control file: too many paragraphs")
+            control = tmp[0]
+            self.click_pkgname = control['Package']
+            self.click_version = control['Version']
+            if self._pkgfmt_type() == "click":
+                if control['Architecture'] not in self.pkg_arch:
+                    self.pkg_arch.append(control['Architecture'])
+                self.pkgfmt["version"] = str(control['Click-Version'])
+
+            # Parse and store the manifest
+            manifest_json = self._extract_manifest_file()
+            try:
+                self.manifest = json.load(manifest_json)
+            except Exception:
+                error("Could not load manifest file. Is it properly formatted?")
+            self._verify_manifest_structure()
+
+            self.valid_frameworks = self._extract_click_frameworks()
+
+            self.peer_hooks = peer_hooks
+            self.peer_hooks_link = peer_hooks_link
+
         self.is_snap_oem = False
         if self.is_snap and 'type' in self.pkg_yaml and \
            self.pkg_yaml['type'] == 'oem':
@@ -191,11 +235,7 @@
         # it now
         # self._list_all_compiled_binaries()
 
-        self.valid_frameworks = self._extract_click_frameworks()
-
-        self.peer_hooks = peer_hooks
         self.overrides = overrides if overrides is not None else {}
-        self.peer_hooks_link = peer_hooks_link
 
     def _extract_click_frameworks(self):
         '''Extract installed click frameworks'''
@@ -248,10 +288,22 @@
             return None
         return out.split()[0]
 
+    def _pkgfmt_type(self):
+        '''Return the package format type'''
+        if "type" not in self.pkgfmt:
+            return ""
+        return self.pkgfmt["type"]
+
+    def _pkgfmt_version(self):
+        '''Return the package format version'''
+        if "version" not in self.pkgfmt:
+            return ""
+        return self.pkgfmt["version"]
+
     def _check_path_exists(self):
         '''Check that the provided path exists'''
-        if not os.path.exists(self.click_package):
-            error("Could not find '%s'" % self.click_package)
+        if not os.path.exists(self.pkg_filename):
+            error("Could not find '%s'" % self.pkg_filename)
 
     def _extract_control_file(self):
         '''Extract '''
 
=== modified file 'clickreviews/cr_content_hub.py'
--- clickreviews/cr_content_hub.py	2015-08-13 21:07:13 +0000
+++ clickreviews/cr_content_hub.py	2015-12-01 15:03:49 +0000
@@ -37,6 +37,10 @@
 
         self.content_hub_files = dict()  # click-show-files and tests
         self.content_hub = dict()
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             if 'content-hub' not in self.manifest['hooks'][app]:
                 # msg("Skipped missing content-hub hook for '%s'" % app)
 
=== modified file 'clickreviews/cr_desktop.py'
--- clickreviews/cr_desktop.py	2015-08-18 16:04:05 +0000
+++ clickreviews/cr_desktop.py	2015-12-01 15:03:49 +0000
@@ -41,6 +41,10 @@
         self.desktop_files = dict()  # click-show-files and a couple tests
         self.desktop_entries = dict()
         self.desktop_hook_entries = 0
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             if 'desktop' not in self.manifest['hooks'][app]:
                 # msg("Skipped missing desktop hook for '%s'" % app)
@@ -196,24 +200,27 @@
                     de.getExec()
                 l = 'http://askubuntu.com/questions/417381/what-does-desktop-exec-mean/417382'
             elif de.getExec().split()[0] not in self.expected_execs:
-                if self.click_arch == "all":  # interpreted file
+                if self.pkg_arch[0] == "all":  # interpreted file
                     if de.getExec().split()[0] not in self.deprecated_execs:
                         s = "found unexpected Exec with architecture '%s': %s" % \
-                            (self.click_arch, de.getExec().split()[0])
+                            (self.pkg_arch[0], de.getExec().split()[0])
                     else:
                         s = "found deprecated Exec with architecture '%s': %s" % \
-                            (self.click_arch, de.getExec().split()[0])
+                            (self.pkg_arch[0], de.getExec().split()[0])
                     t = 'warn'
                 else:                        # compiled
                     # TODO: this can be a lot smarter
                     s = "Non-standard Exec with architecture " + \
                         "'%s': %s (ok for compiled code)" % \
-                        (self.click_arch, de.getExec().split()[0])
+                        (self.pkg_arch[0], de.getExec().split()[0])
                     t = 'info'
             self._add_result(t, n, s, l)
 
     def check_desktop_exec_webapp_container(self):
         '''Check Exec=webapp-container entry'''
+        if self.manifest is None:
+            return
+
         fwk = self.manifest['framework']
 
         for app in sorted(self.desktop_entries):
 
=== modified file 'clickreviews/cr_framework.py'
--- clickreviews/cr_framework.py	2015-08-20 20:52:17 +0000
+++ clickreviews/cr_framework.py	2015-12-01 15:03:49 +0000
@@ -23,22 +23,24 @@
 
 
 class ClickReviewFramework(ClickReview):
-    '''This class represents click lint reviews'''
+    '''This class represents click framework reviews'''
     def __init__(self, fn, overrides=None):
         ClickReview.__init__(self, fn, "framework", overrides=overrides)
 
         self.frameworks_file = dict()
         self.frameworks = dict()
-        for app in self.manifest['hooks']:
-            if 'framework' not in self.manifest['hooks'][app]:
-                # msg("Skipped missing framework hook for '%s'" % app)
-                continue
-            if not isinstance(self.manifest['hooks'][app]['framework'], str):
-                error("manifest malformed: hooks/%s/framework is not str" %
-                      app)
-            (full_fn, data) = self._extract_framework(app)
-            self.frameworks_file[app] = full_fn
-            self.frameworks[app] = data
+
+        if self.manifest is not None:
+            for app in self.manifest['hooks']:
+                if 'framework' not in self.manifest['hooks'][app]:
+                    # msg("Skipped missing framework hook for '%s'" % app)
+                    continue
+                if not isinstance(self.manifest['hooks'][app]['framework'], str):
+                    error("manifest malformed: hooks/%s/framework is not str" %
+                          app)
+                (full_fn, data) = self._extract_framework(app)
+                self.frameworks_file[app] = full_fn
+                self.frameworks[app] = data
 
         self.framework_policy_dirs = ['apparmor', 'seccomp']
         self.framework_policy_subdirs = ['templates', 'policygroups']
 
=== modified file 'clickreviews/cr_functional.py'
--- clickreviews/cr_functional.py	2015-08-13 21:07:13 +0000
+++ clickreviews/cr_functional.py	2015-12-01 15:03:49 +0000
@@ -39,6 +39,9 @@
 
     def check_applicationName(self):
         '''Check applicationName matches click manifest'''
+        if self.manifest is None:
+            return
+
         t = 'info'
         n = self._get_check_name('qml_applicationName_matches_manifest')
         s = "OK"
@@ -100,18 +103,13 @@
 
             if len(appnames) == 0:
                 s = "could not find applicationName in: %s" % \
-                    ", ".join(list(map(
-                                   lambda x: os.path.relpath(x,
-                                                             self.unpack_dir),
-                                   qmls)
-                                   ))
+                    ", ".join(sorted(list(map(
+                        lambda x: os.path.relpath(x, self.unpack_dir), qmls))))
             else:  # not ok
                 s = "click manifest name '%s' not found in: " % \
                     self.click_pkgname + "%s" % \
-                    ", ".join(list(map(
-                                   lambda x: "%s ('%s')" % (x, appnames[x]),
-                                   appnames)
-                                   ))
+                    ", ".join(sorted(list(map(
+                        lambda x: "%s ('%s')" % (x, appnames[x]), appnames))))
 
             if len(self.pkg_bin_files) == 0:
                 s += ". Application may not work properly when confined."
@@ -148,7 +146,8 @@
         s = "OK"
         l = None
 
-        if self.manifest['framework'] == "ubuntu-sdk-13.10":
+        if self.manifest is not None and \
+                self.manifest['framework'] == "ubuntu-sdk-13.10":
             s = "SKIPPED (Oxide not available in ubuntu-sdk-13.10)"
         else:
             qmls = []
 
=== modified file 'clickreviews/cr_lint.py'
--- clickreviews/cr_lint.py	2015-11-24 12:13:36 +0000
+++ clickreviews/cr_lint.py	2015-12-01 15:03:49 +0000
@@ -76,7 +76,7 @@
                           'RCS*'
                           ]
 
-        if 'maintainer' in self.manifest:
+        if self.manifest is not None and 'maintainer' in self.manifest:
             maintainer = self.manifest['maintainer']
             self.email = maintainer.partition('<')[2].rstrip('>')
             self.is_core_app = \
@@ -125,13 +125,19 @@
         # Valid values for 'type' in packaging yaml
         # - app
         # - framework
+        # - kernel
         # - oem
+        # - os
         self.snappy_valid_types = ['app',
                                    'framework',
+                                   'kernel',
                                    'oem',
+                                   'os',
                                    ]
         self.snappy_redflagged_types = ['framework',
-                                        'oem',  # TBD
+                                        'kernel',
+                                        'oem',
+                                        'os',
                                         ]
 
     def _list_control_files(self):
@@ -142,6 +148,10 @@
 
     def check_control_files(self):
         '''Check DEBIAN/* files'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         for f in self.control_files:
             t = 'info'
             n = self._get_check_name(
@@ -169,6 +179,10 @@
 
     def check_control(self):
         '''Check control()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         fh = self._extract_control_file()
         tmp = list(Deb822.iter_paragraphs(fh))
         t = 'info'
@@ -340,6 +354,10 @@
 
     def check_preinst(self):
         '''Check preinst()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         expected = '''#! /bin/sh
 echo "Click packages may not be installed directly using dpkg."
 echo "Use 'click install' instead."
@@ -361,6 +379,10 @@
 
     def check_hooks(self):
         '''Check click manifest hooks'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         #  oem snaps don't have a hooks entry
         if self.is_snap_oem:
             return
@@ -457,6 +479,10 @@
 
     def check_hooks_unknown(self):
         '''Check if have any unknown hooks'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         #  oem snaps don't have a hooks entry
         if self.is_snap_oem:
             return
@@ -478,6 +504,10 @@
 
     def check_hooks_redflagged(self):
         '''Check if have any redflagged hooks'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('redflagged_hooks')
         s = 'OK'
@@ -502,6 +532,9 @@
 
     def check_external_symlinks(self):
         '''Check if symlinks in the click package go out to the system.'''
+        if self.is_snap and self.pkg_yaml['type'] not in ['app', 'framework']:
+            return
+
         t = 'info'
         n = self._get_check_name('external_symlinks')
         s = 'OK'
@@ -571,7 +604,11 @@
         self._add_result(t, n, s)
 
     def check_version(self):
-        '''Check package version is valid'''
+        '''Check click package version is valid'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         # deb-version(5)
         t = 'info'
         n = self._get_check_name('version_valid')
@@ -586,13 +623,17 @@
         self._add_result(t, n, s)
 
     def check_architecture(self):
-        '''Check package architecture in DEBIAN/control is valid'''
+        '''Check click package architecture in DEBIAN/control is valid'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('control_architecture_valid')
         s = 'OK'
-        if self.click_arch not in self.valid_control_architectures:
+        if self.pkg_arch[0] not in self.valid_control_architectures:
             t = 'error'
-            s = "not a valid architecture: %s" % self.click_arch
+            s = "not a valid architecture: %s" % self.pkg_arch[0]
         self._add_result(t, n, s)
 
     def check_architecture_all(self):
@@ -600,7 +641,7 @@
         t = 'info'
         n = self._get_check_name('control_architecture_valid_contents')
         s = 'OK'
-        if self.click_arch != "all":
+        if self.pkg_arch[0] != "all":
             self._add_result(t, n, s)
             return
 
@@ -616,22 +657,27 @@
 
     def check_architecture_specified_needed(self):
         '''Check if the specified architecture is actually needed'''
-        t = 'info'
-        n = self._get_check_name('control_architecture_specified_needed')
-        s = 'OK'
-        if self.click_arch == "all":
-            s = "SKIPPED: architecture is 'all'"
+        for arch in self.pkg_arch:
+            t = 'info'
+            n = self._get_check_name('architecture_specified_needed')
+            s = 'OK'
+            if arch == "all":
+                s = "SKIPPED: architecture is 'all'"
+                self._add_result(t, n, s)
+                return
+
+            if len(self.pkg_bin_files) == 0:
+                t = 'warn'
+                s = "Could not find compiled binaries for architecture '%s'" % \
+                    arch
             self._add_result(t, n, s)
-            return
-
-        if len(self.pkg_bin_files) == 0:
-            t = 'warn'
-            s = "Could not find compiled binaries for architecture '%s'" % \
-                self.click_arch
-        self._add_result(t, n, s)
 
     def check_maintainer(self):
-        '''Check maintainer()'''
+        '''Check manifest maintainer()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('maintainer_present')
         s = 'OK'
@@ -671,7 +717,11 @@
         self._add_result(t, n, s)
 
     def check_title(self):
-        '''Check title()'''
+        '''Check manifest title()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('title_present')
         s = 'OK'
@@ -691,7 +741,11 @@
         self._add_result(t, n, s)
 
     def check_description(self):
-        '''Check description()'''
+        '''Check manifest description()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('description_present')
         s = 'OK'
@@ -717,7 +771,11 @@
         self._add_result(t, n, s)
 
     def check_framework(self):
-        '''Check framework()'''
+        '''Check manifest framework()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         n = self._get_check_name('framework')
         l = "http://askubuntu.com/questions/460512/what-framework-should-i-use-in-my-manifest-file"
         framework_overrides = self.overrides.get('framework', {})
@@ -759,6 +817,10 @@
 
     def check_click_local_extensions(self):
         '''Report any click local extensions'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('click_local_extensions')
         s = 'OK'
@@ -781,90 +843,8 @@
             s = 'found unofficial extension%s: %s' % (plural, ', '.join(found))
         self._add_result(t, n, s)
 
-    def check_package_filename(self):
-        '''Check filename of package'''
-        tmp = os.path.basename(self.click_package).split('_')
-        click_package_bn = os.path.basename(self.click_package)
-        t = 'info'
-        n = self._get_check_name('package_filename_format')
-        s = 'OK'
-        l = 'http://askubuntu.com/questions/685049/what-does-lint-package-filename-format-mean/685050'
-        if len(tmp) != 3:
-            t = 'warn'
-            s = "'%s' not of form $pkgname_$version_$arch.[click|snap]" % \
-                click_package_bn
-        self._add_result(t, n, s, l)
-
-        t = 'info'
-        n = self._get_check_name('package_filename_version_match')
-        s = 'OK'
-        l = None
-        if len(tmp) >= 2:
-            #  handle $pkgname_$version.click or $pkgname_$version.snap
-            if self.click_package.endswith('.snap'):
-                version = tmp[1].partition('.snap')[0]
-            else:
-                version = tmp[1].partition('.click')[0]
-            if version != self.click_version:
-                t = 'error'
-                s = "'%s' != '%s' from DEBIAN/control" % (version,
-                                                          self.click_version)
-                l = 'http://askubuntu.com/questions/417384/what-does-lint-package-filename-version-match-mean/417385'
-        else:
-            t = 'warn'
-            s = "could not determine version from '%s'" % \
-                os.path.basename(self.click_package)
-        self._add_result(t, n, s, l)
-
-        t = 'info'
-        n = self._get_check_name('package_filename_arch_valid')
-        s = 'OK'
-        l = 'http://askubuntu.com/questions/685103/what-does-lint-package-filename-arch-valid-mean/685104'
-        if len(tmp) >= 3:
-            if self.click_package.endswith('.snap'):
-                arch = tmp[2].partition('.snap')[0]
-            else:
-                arch = tmp[2].partition('.click')[0]
-            if arch == "unknown":
-                # short-circuit here since the appstore doesn't determine
-                # the version yet
-                t = 'info'
-                s = "SKIP: architecture 'unknown'"
-                self._add_result(t, n, s)
-                return
-            if arch not in self.valid_control_architectures:
-                t = 'warn'
-                s = "not a valid architecture: %s" % arch
-        else:
-            t = 'warn'
-            s = "could not determine architecture from '%s'" % \
-                os.path.basename(self.click_package)
-        self._add_result(t, n, s, l)
-
-        t = 'info'
-        n = self._get_check_name('package_filename_arch_match')
-        s = 'OK'
-        if len(tmp) >= 3:
-            if self.click_package.endswith('.snap'):
-                arch = tmp[2].partition('.snap')[0]
-            else:
-                arch = tmp[2].partition('.click')[0]
-            if arch != self.click_arch:
-                if arch == 'all' and self.click_arch == 'multi':
-                    # The store creates filenames for fat packages with _all
-                    pass
-                else:
-                    t = 'error'
-                    s = "'%s' != '%s' from DEBIAN/control" % (arch,
-                                                              self.click_arch)
-        else:
-            t = 'warn'
-            s = "could not determine architecture from '%s'" % \
-                os.path.basename(self.click_package)
-        self._add_result(t, n, s)
-
     def check_vcs(self):
-        '''Check for VCS files in the click package'''
+        '''Check for VCS files in the package'''
         t = 'info'
         n = self._get_check_name('vcs_files')
         s = 'OK'
@@ -881,6 +861,9 @@
 
     def check_click_in_package(self):
         '''Check for *.click files in the toplevel click package'''
+        if self._pkgfmt_type() == "snap":
+            return
+
         t = 'info'
         n = self._get_check_name('click_files')
         s = 'OK'
@@ -896,6 +879,10 @@
 
     def check_dot_click(self):
         '''Check for .click directory in the toplevel click package'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         t = 'info'
         n = self._get_check_name('dot_click')
         s = 'OK'
@@ -971,6 +958,10 @@
 
     def check_manifest_architecture(self):
         '''Check package architecture in manifest is valid'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         self._verify_architecture(self.manifest, "manifest")
 
     def _verify_icon(self, my_dict, test_str):
@@ -1003,6 +994,10 @@
 
     def check_icon(self):
         '''Check icon()'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         self._verify_icon(self.manifest, "manifest")
 
     def check_snappy_name(self):
@@ -1111,7 +1106,8 @@
                 unknown.append(f)
         if len(unknown) > 0:
             t = 'warn'
-            s = "unknown entries in package.yaml: '%s'" % (",".join(unknown))
+            s = "unknown entries in package.yaml: '%s'" % \
+                (",".join(sorted(unknown)))
             obsoleted = ['maintainer', 'ports']
             tmp = list(set(unknown) & set(obsoleted))
             if len(tmp) > 0:
@@ -1210,7 +1206,7 @@
 
     def check_is_squashfs(self):
         '''Check snapfs'''
-        if is_squashfs(self.click_package):
+        if is_squashfs(self.pkg_filename):
             t = 'error'
             n = self._get_check_name('is_squashfs')
             s = "(MANUAL REVIEW) squashfs pkg"
@@ -1219,10 +1215,14 @@
 
     def check_snappy_hashes(self):
         '''Check snappy hashes.yaml'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         if not self.is_snap:
             return
         # no hashes.yaml for squashfs images
-        if is_squashfs(self.click_package):
+        if is_squashfs(self.pkg_filename):
             return
 
         def _check_allowed_perms(mode, allowed):
@@ -1387,3 +1387,7 @@
             s = 'found extra files not listed in hashes.yaml: %s' % \
                 ", ".join(extra)
         self._add_result(t, n, s)
+
+    def check_snappy_frameworks(self):
+        '''TODO'''
+        return False
 
=== modified file 'clickreviews/cr_online_accounts.py'
--- clickreviews/cr_online_accounts.py	2015-11-27 09:04:43 +0000
+++ clickreviews/cr_online_accounts.py	2015-12-01 15:03:49 +0000
@@ -78,6 +78,10 @@
                               'account-provider',
                               'account-qml-plugin',
                               'account-service']
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             for h in self.account_hooks:
                 if h not in self.manifest['hooks'][app]:
@@ -120,6 +124,9 @@
 
     def _extract_account(self, app, account_type):
         '''Extract accounts'''
+        if self.manifest is None:
+            return
+
         a = self.manifest['hooks'][app][account_type]
         fn = os.path.join(self.unpack_dir, a)
 
@@ -158,6 +165,9 @@
 
     def check_hooks_versions(self):
         '''Check hooks versions'''
+        if self.manifest is None:
+            return
+
         framework = self.manifest['framework']
         if not framework.startswith("ubuntu-sdk"):
             return
 
=== modified file 'clickreviews/cr_push_helper.py'
--- clickreviews/cr_push_helper.py	2015-08-13 21:07:13 +0000
+++ clickreviews/cr_push_helper.py	2015-12-01 15:03:49 +0000
@@ -38,6 +38,10 @@
 
         self.push_helper_files = dict()  # click-show-files and tests
         self.push_helper = dict()
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             if 'push-helper' not in self.manifest['hooks'][app]:
                 # msg("Skipped missing push-helper hook for '%s'" % app)
@@ -121,6 +125,9 @@
 
     def check_hooks(self):
         '''Verify combinations of click hooks with the push-helper hook'''
+        if self.manifest is None:
+            return
+
         for app in sorted(self.manifest['hooks']):
             if app not in self.push_helper:
                 continue
 
=== modified file 'clickreviews/cr_scope.py'
--- clickreviews/cr_scope.py	2015-12-01 07:45:05 +0000
+++ clickreviews/cr_scope.py	2015-12-01 15:03:49 +0000
@@ -41,6 +41,10 @@
                              overrides=overrides)
 
         self.scopes = dict()
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             if 'scope' not in self.manifest['hooks'][app]:
                 # msg("Skipped missing scope hook for '%s'" % app)
 
=== modified file 'clickreviews/cr_security.py'
--- clickreviews/cr_security.py	2015-11-24 12:13:36 +0000
+++ clickreviews/cr_security.py	2015-12-01 15:03:49 +0000
@@ -131,36 +131,79 @@
         framework_overrides = self.overrides.get('framework', {})
         self._override_framework_policies(framework_overrides)
 
+        # snappy
+        self.sec_skipped_types = ['oem',
+                                  'os',
+                                  'kernel']  # these don't need security items
+
         self.security_manifests = dict()
         self.security_apps = []
-        for app in self.manifest['hooks']:
-            if 'apparmor' not in self.manifest['hooks'][app]:
-                #  msg("Skipped missing apparmor hook for '%s'" % app)
-                continue
-            if not isinstance(self.manifest['hooks'][app]['apparmor'], str):
-                error("manifest malformed: hooks/%s/apparmor is not str" % app)
-            rel_fn = self.manifest['hooks'][app]['apparmor']
-            self.security_manifests[rel_fn] = \
-                self._extract_security_manifest(app)
-            self.security_apps.append(app)
-
         self.security_profiles = dict()
         self.security_apps_profiles = []
-        for app in self.manifest['hooks']:
-            if 'apparmor-profile' not in self.manifest['hooks'][app]:
-                #  msg("Skipped missing apparmor hook for '%s'" % app)
-                continue
-            if not isinstance(self.manifest['hooks'][app]['apparmor-profile'],
-                              str):
-                error("manifest malformed: hooks/%s/apparmor-profile is not "
-                      "str" % app)
-            rel_fn = self.manifest['hooks'][app]['apparmor-profile']
-            self.security_profiles[rel_fn] = \
-                self._extract_security_profile(app)
-            self.security_apps_profiles.append(app)
-
-        # snappy
-        self.sec_skipped_types = ['oem']  # these don't need security items
+
+        if self.manifest is None and self.is_snap:
+            for exe_t in ['services', 'binaries']:
+                if exe_t not in self.pkg_yaml:
+                    continue
+                for item in self.pkg_yaml[exe_t]:
+                    if 'name' not in item:
+                        continue
+                    app = "%s/%s" % (exe_t, item['name'])
+
+                    if 'security-policy' in item:
+                        if 'apparmor' not in item['security-policy']:
+                            continue
+                        rel_fn = item['security-policy']['apparmor']
+                        self.security_profiles[rel_fn] = \
+                            self._extract_security_profile(app)
+                        self.security_apps_profiles.append(app)
+                        continue
+
+                    # Fake a security manifest for code reuse
+                    # FIXME: this needs to be updated when we have 'target'
+                    m = dict()
+                    m['policy_vendor'] = "ubuntu-core"
+                    m['policy_version'] = self._pkgfmt_version()
+                    if 'security-template' in item:
+                        m['template'] = item['security-template']
+                    else:
+                        m['template'] = 'default'
+
+                    if 'caps' in item:
+                        m['policy_groups'] = item['caps']
+                    elif self._pkgfmt_version() == "15.04":
+                        m['policy_groups'] = ['networking']
+                    else:
+                        m['policy_groups'] = ['network-client']
+
+                    self.security_manifests[app] = m
+                    self.security_apps.append(app)
+        else:
+            self.security_manifests = dict()
+            self.security_apps = []
+            for app in self.manifest['hooks']:
+                if 'apparmor' not in self.manifest['hooks'][app]:
+                    #  msg("Skipped missing apparmor hook for '%s'" % app)
+                    continue
+                if not isinstance(self.manifest['hooks'][app]['apparmor'], str):
+                    error("manifest malformed: hooks/%s/apparmor is not str" % app)
+                rel_fn = self.manifest['hooks'][app]['apparmor']
+                self.security_manifests[rel_fn] = \
+                    self._extract_security_manifest(app)
+                self.security_apps.append(app)
+
+            for app in self.manifest['hooks']:
+                if 'apparmor-profile' not in self.manifest['hooks'][app]:
+                    #  msg("Skipped missing apparmor hook for '%s'" % app)
+                    continue
+                if not isinstance(self.manifest['hooks'][app]['apparmor-profile'],
+                                  str):
+                    error("manifest malformed: hooks/%s/apparmor-profile is not "
+                          "str" % app)
+                rel_fn = self.manifest['hooks'][app]['apparmor-profile']
+                self.security_profiles[rel_fn] = \
+                    self._extract_security_profile(app)
+                self.security_apps_profiles.append(app)
 
     def _override_framework_policies(self, overrides):
         # override major framework policies
@@ -222,21 +265,32 @@
 
     def _get_security_manifest(self, app):
         '''Get the security manifest for app'''
-        if app not in self.manifest['hooks']:
-            error("Could not find '%s' in click manifest" % app)
-        elif 'apparmor' not in self.manifest['hooks'][app]:
-            error("Could not find apparmor hook for '%s' in click manifest" %
-                  app)
-        f = self.manifest['hooks'][app]['apparmor']
-        m = self.security_manifests[f]
+        if self._pkgfmt_type() == "click" or self._pkgfmt_version() == "15.04":
+            if app not in self.manifest['hooks']:
+                error("Could not find '%s' in click manifest" % app)
+            elif 'apparmor' not in self.manifest['hooks'][app]:
+                error("Could not find apparmor hook for '%s' in click manifest" %
+                      app)
+            f = self.manifest['hooks'][app]['apparmor']
+            m = self.security_manifests[f]
+        else:
+            f = app
+            m = self.security_manifests[app]
+
         return (f, m)
 
     def _extract_security_profile(self, app):
         '''Extract security profile'''
-        d = self.manifest['hooks'][app]['apparmor-profile']
-        fn = os.path.join(self.unpack_dir, d)
-        rel_fn = self.manifest['hooks'][app]['apparmor-profile']
+        if self._pkgfmt_type() == "click" or self._pkgfmt_version() == "15.04":
+            rel_fn = self.manifest['hooks'][app]['apparmor-profile']
+        else:
+            exe_t, name = app.split('/')
+            for item in self.pkg_yaml[exe_t]:
+                if 'name' in item and item['name'] == name:
+                    rel_fn = item['security-policy']['apparmor']
+                    break
 
+        fn = os.path.join(self.unpack_dir, rel_fn)
         if not os.path.exists(fn):
             error("Could not find '%s'" % rel_fn)
 
@@ -254,12 +308,20 @@
 
     def _get_security_profile(self, app):
         '''Get the security profile for app'''
-        if app not in self.manifest['hooks']:
-            error("Could not find '%s' in click manifest" % app)
-        elif 'apparmor-profile' not in self.manifest['hooks'][app]:
-            error("Could not find apparmor-profile hook for '%s' in click "
-                  "manifest" % app)
-        f = self.manifest['hooks'][app]['apparmor-profile']
+        if self._pkgfmt_type() == "click" or self._pkgfmt_version() == "15.04":
+            if app not in self.manifest['hooks']:
+                error("Could not find '%s' in click manifest" % app)
+            elif 'apparmor-profile' not in self.manifest['hooks'][app]:
+                error("Could not find apparmor-profile hook for '%s' in click "
+                      "manifest" % app)
+            f = self.manifest['hooks'][app]['apparmor-profile']
+        else:
+            exe_t, name = app.split('/')
+            for item in self.pkg_yaml[exe_t]:
+                if 'name' in item and item['name'] == name:
+                    f = item['security-policy']['apparmor']
+                    break
+
         p = self.security_profiles[f]
         return (f, p)
 
@@ -343,6 +405,10 @@
                 s = "policy_vendor '%s' not found" % m['policy_vendor']
             self._add_result(t, n, s)
 
+            if self._pkgfmt_type() == "snap" and \
+                    float(self._pkgfmt_version()) >= 16.04:
+                continue
+
             t = 'info'
             n = self._get_check_name('policy_vendor_matches_framework', extra=f)
             s = "OK"
@@ -408,6 +474,10 @@
                 s = '%s != %s' % (str(m['policy_version']), str(highest))
             self._add_result(t, n, s, l)
 
+            if self._pkgfmt_type() == "snap" and \
+                    float(self._pkgfmt_version()) >= 16.04:
+                continue
+
             t = 'info'
             n = self._get_check_name('policy_version_matches_framework', extra=f)
             s = "OK"
@@ -545,29 +615,17 @@
 
             self._add_result(t, n, s)
 
-    def check_template_push_helpers(self):
-        '''Check template for push-helpers'''
-        for app in sorted(self.security_apps):
-            (f, m) = self._get_security_manifest(app)
-            t = 'info'
-            n = self._get_check_name('template_push_helper', extra=f)
-            s = "OK"
-            if 'push-helper' not in self.manifest['hooks'][app]:
-                continue
-            if 'template' not in m or m['template'] != "ubuntu-push-helper":
-                t = 'error'
-                s = "template is not 'ubuntu-push-helper'"
-            self._add_result(t, n, s)
-
     def check_policy_groups_push_helpers(self):
-        '''Check policy_groups for push-helpers'''
+        '''Check policy groups for push-helpers'''
         for app in sorted(self.security_apps):
             (f, m) = self._get_security_manifest(app)
             t = 'info'
             n = self._get_check_name('policy_groups_push_helper', extra=f)
             s = "OK"
-            if 'push-helper' not in self.manifest['hooks'][app]:
+
+            if 'template' not in m or m['template'] != 'ubuntu-push-helper':
                 continue
+
             if 'policy_groups' not in m or \
                'push-notification-client' not in m['policy_groups']:
                 self._add_result('error', n,
@@ -578,7 +636,7 @@
             for p in m['policy_groups']:
                 if p not in self.allowed_push_helper_policy_groups:
                     bad.append(p)
-                elif p == "networking":
+                elif p == "networking" or p == "network-client":
                     # The above covers this, but let's be very explicit and
                     # never allow networking with push-helpers
                     bad.append(p)
@@ -624,7 +682,8 @@
         '''Check policy_groups for ubuntu-account-plugin template'''
         for app in sorted(self.security_apps):
             (f, m) = self._get_security_manifest(app)
-            if 'account-qml-plugin' not in self.manifest['hooks'][app]:
+
+            if 'template' not in m or m['template'] != 'ubuntu-account-plugin':
                 continue
 
             t = 'info'
@@ -843,12 +902,17 @@
         for app in sorted(self.security_apps_profiles):
             (f, p) = self._get_security_profile(app)
 
-            for v in ['###VAR###',
-                      '###PROFILEATTACH###',
-                      '@{CLICK_DIR}',
-                      '@{APP_PKGNAME}',
-                      '@{APP_VERSION}',
-                      ]:
+            searches = ['###VAR###',
+                        '###PROFILEATTACH###',
+                        '@{CLICK_DIR}',
+                        '@{APP_PKGNAME}',
+                        '@{APP_VERSION}',
+                        ]
+            if self._pkgfmt_type() == 'snap' and \
+                    float(self._pkgfmt_version()) > 15.04:
+                searches.append("@{INSTALL_DIR}")
+
+            for v in searches:
                 t = 'info'
                 n = self._get_check_name(
                     'apparmor_profile', extra='%s (%s)' % (v, f))
@@ -1081,7 +1145,9 @@
         '''Verify click and security yaml are in sync (not including
            override)
         '''
-        if not self.is_snap or self.pkg_yaml['type'] in self.sec_skipped_types:
+        if not self.is_snap or \
+                self.pkg_yaml['type'] in self.sec_skipped_types or \
+                float(self._pkgfmt_version()) > 15.04:
             return
 
         # setup a small dict that is a subset of self.pkg_yaml
@@ -1121,7 +1187,9 @@
 
     def check_security_yaml_override_and_click(self):
         '''Verify click and security yaml override are in sync'''
-        if not self.is_snap or self.pkg_yaml['type'] in self.sec_skipped_types:
+        if not self.is_snap or \
+                self.pkg_yaml['type'] in self.sec_skipped_types or \
+                float(self._pkgfmt_version()) > 15.04:
             return
 
         for exe_t in ['services', 'binaries']:
@@ -1180,16 +1248,44 @@
                 s = "OK"
                 if 'security-override' not in item:
                     s = "OK (skipping unspecified override)"
-                elif 'apparmor' not in item['security-override']:
-                    t = 'error'
-                    s = "'apparmor' not specified in 'security-override' " + \
-                        "for '%s'" % app
-                elif 'seccomp' not in item['security-override']:
-                    t = 'error'
-                    s = "'seccomp' not specified in 'security-override' " + \
-                        "for '%s'" % app
+                elif float(self._pkgfmt_version()) < 16.04:
+                    if 'apparmor' not in item['security-override']:
+                        t = 'error'
+                        s = "'apparmor' not specified in 'security-override' " + \
+                            "for '%s'" % app
+                    elif 'seccomp' not in item['security-override']:
+                        t = 'error'
+                        s = "'seccomp' not specified in 'security-override' " + \
+                            "for '%s'" % app
+                else:
+                    allowed_fields = ['read-paths',
+                                      'write-paths',
+                                      'abstractions',
+                                      'syscalls']
+                    if len(item['security-override'].keys()) == 0:
+                        t = 'error'
+                        s = "nothing specified in 'security-override' " + \
+                            "for '%s'" % app
+                    else:
+                        for f in item['security-override'].keys():
+                            if f not in allowed_fields:
+                                t = 'error'
+                                s = "unknown field '%s' in " % f + \
+                                    "'security-override' for '%s'" % app
+
                 self._add_result(t, n, s)
 
+                # security-override on 16.04 gives direct access to syscalls,
+                # read-paths, etc so it always needs a manual override
+                if 'security-override' in item and \
+                        float(self._pkgfmt_version()) > 15.04:
+                    t = 'error'
+                    n = self._get_check_name('yaml_override_present')
+                    s = "(MANUAL REVIEW) 'security-override' not allowed"
+                    l = 'https://developer.ubuntu.com/en/snappy/guides/security-policy/'
+                    m = True
+                    self._add_result(t, n, s, link=l, manual_review=m)
+
     def check_security_yaml_policy(self):
         '''Verify security yaml policy'''
         if not self.is_snap:
@@ -1305,20 +1401,21 @@
                     continue
                 self._add_result(t, n, s)
 
-                t = 'info'
-                n = self._get_check_name('yaml_security-template_in_manifest', app=app)
-                s = "OK"
-                if app not in self.manifest['hooks']:
-                    t = 'error'
-                    s = "'%s' not found in click manifest" % app
-                    self._add_result(t, n, s)
-                    continue
-                elif 'apparmor' not in self.manifest['hooks'][app] and \
-                     'apparmor-profile' not in self.manifest['hooks'][app]:
-                    t = 'error'
-                    s = "'apparmor' not found in click manifest for '%s'" % app
-                    self._add_result(t, n, s)
-                    continue
+                if self._pkgfmt_version() == "15.04":
+                    t = 'info'
+                    n = self._get_check_name('yaml_security-template_in_manifest', app=app)
+                    s = "OK"
+                    if app not in self.manifest['hooks']:
+                        t = 'error'
+                        s = "'%s' not found in click manifest" % app
+                        self._add_result(t, n, s)
+                        continue
+                    elif 'apparmor' not in self.manifest['hooks'][app] and \
+                         'apparmor-profile' not in self.manifest['hooks'][app]:
+                        t = 'error'
+                        s = "'apparmor' not found in click manifest for '%s'" % app
+                        self._add_result(t, n, s)
+                        continue
 
         # TODO: error if not 'common' or is 'unconfined'
 
@@ -1358,25 +1455,30 @@
                     continue
                 self._add_result(t, n, s)
 
-                t = 'info'
-                n = self._get_check_name('yaml_caps_in_manifest', app=app)
-                s = "OK"
-                if app not in self.manifest['hooks']:
-                    t = 'error'
-                    s = "'%s' not found in click manifest" % app
-                    self._add_result(t, n, s)
-                    continue
-                elif 'apparmor' not in self.manifest['hooks'][app] and \
-                     'apparmor-profile' not in self.manifest['hooks'][app]:
-                    t = 'error'
-                    s = "'apparmor' not found in click manifest for '%s'" % app
-                    self._add_result(t, n, s)
-                    continue
+                if self._pkgfmt_version() == "15.04":
+                    t = 'info'
+                    n = self._get_check_name('yaml_caps_in_manifest', app=app)
+                    s = "OK"
+                    if app not in self.manifest['hooks']:
+                        t = 'error'
+                        s = "'%s' not found in click manifest" % app
+                        self._add_result(t, n, s)
+                        continue
+                    elif 'apparmor' not in self.manifest['hooks'][app] and \
+                         'apparmor-profile' not in self.manifest['hooks'][app]:
+                        t = 'error'
+                        s = "'apparmor' not found in click manifest for '%s'" % app
+                        self._add_result(t, n, s)
+                        continue
 
         # TODO: error if not 'common'
 
     def check_template_online_accounts_provider(self):
         '''Check template for online accounts account-provider'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         for app in sorted(self.security_apps):
             (f, m) = self._get_security_manifest(app)
             t = 'info'
@@ -1391,6 +1493,10 @@
 
     def check_template_online_accounts_qml_plugin(self):
         '''Check template for online accounts account-qml-plugin'''
+        if self._pkgfmt_type() == "snap" and \
+                float(self._pkgfmt_version()) > 15.04:
+            return
+
         for app in sorted(self.security_apps):
             (f, m) = self._get_security_manifest(app)
             t = 'info'
 
=== modified file 'clickreviews/cr_tests.py'
--- clickreviews/cr_tests.py	2015-11-12 13:37:12 +0000
+++ clickreviews/cr_tests.py	2015-12-01 15:03:49 +0000
@@ -50,6 +50,8 @@
 TEST_FRAMEWORK = dict()
 TEST_FRAMEWORK_POLICY = dict()
 TEST_FRAMEWORK_POLICY_UNKNOWN = []
+TEST_PKGFMT_TYPE = "click"
+TEST_PKGFMT_VERSION = "0.4"
 
 
 #
@@ -139,6 +141,9 @@
 
 def _get_security_manifest(self, app):
     '''Pretend we read the security manifest file'''
+    if TEST_PKGFMT_VERSION == "16.04":
+        return (app, json.loads(TEST_SECURITY[app]))
+
     return ("%s.apparmor" % app, json.loads(TEST_SECURITY[app]))
 
 
@@ -244,6 +249,21 @@
     return True
 
 
+def _pkgfmt_type(self):
+    '''Pretend we found the pkgfmt type'''
+    return TEST_PKGFMT_TYPE
+
+
+def _pkgfmt_version(self):
+    '''Pretend we found the pkgfmt version'''
+    return TEST_PKGFMT_VERSION
+
+
+def _is_squashfs(self):
+    '''Pretend we discovered if it is a squashfs or not'''
+    return (TEST_PKGFMT_TYPE == "snap" and float(TEST_PKGFMT_VERSION) > 15.04)
+
+
 def create_patches():
     # http://docs.python.org/3.4/library/unittest.mock-examples.html
     # Mock patching. Don't use decorators but instead patch in setUp() of the
@@ -367,7 +387,14 @@
     patches.append(patch(
         'clickreviews.cr_framework.ClickReviewFramework._has_framework_in_metadir',
         _has_framework_in_metadir))
-    patches.append(patch("clickreviews.cr_lint.is_squashfs", lambda x: False))
+
+    # pkgfmt
+    patches.append(patch("clickreviews.cr_common.ClickReview._pkgfmt_type",
+                   _pkgfmt_type))
+    patches.append(patch("clickreviews.cr_common.ClickReview._pkgfmt_version",
+                   _pkgfmt_version))
+    patches.append(patch("clickreviews.cr_common.is_squashfs", _is_squashfs))
+    patches.append(patch("clickreviews.cr_lint.is_squashfs", _is_squashfs))
 
     return patches
 
@@ -427,6 +454,8 @@
         self.test_readme_md = self.test_control['Description']
         self._update_test_readme_md()
 
+        self.set_test_pkgfmt("click", "0.4")
+
         # hooks
         self.test_security_manifests = dict()
         self.test_security_profiles = dict()
@@ -444,6 +473,7 @@
         self.test_framework = dict()
         self.test_framework_policy = dict()
         self.test_framework_policy_unknown = []
+
         for app in self.test_manifest["hooks"].keys():
             # setup security manifest for each app
             self.set_test_security_manifest(app, 'policy_groups',
@@ -846,6 +876,12 @@
             self.test_security_profiles[app] = policy
         self._update_test_security_profiles()
 
+    def set_test_pkgfmt(self, t, v):
+        global TEST_PKGFMT_TYPE
+        global TEST_PKGFMT_VERSION
+        TEST_PKGFMT_TYPE = t
+        TEST_PKGFMT_VERSION = v
+
     def set_test_desktop(self, app, key, value, no_update=False):
         '''Set key in desktop file to value. If value is None, remove key'''
         if app not in self.test_desktop_files:
@@ -1137,6 +1173,10 @@
         TEST_FRAMEWORK_POLICY = dict()
         global TEST_FRAMEWORK_POLICY_UNKNOWN
         TEST_FRAMEWORK_POLICY_UNKNOWN = []
+        global TEST_PKGFMT_TYPE
+        TEST_PKGFMT_TYPE = "click"
+        global TEST_PKGFMT_VERSION
+        TEST_PKGFMT_VERSION = "0.4"
 
         self._reset_test_data()
         cr_common.recursive_rm(self.desktop_tmpdir)
 
=== modified file 'clickreviews/cr_url_dispatcher.py'
--- clickreviews/cr_url_dispatcher.py	2015-08-13 21:07:13 +0000
+++ clickreviews/cr_url_dispatcher.py	2015-12-01 15:03:49 +0000
@@ -40,6 +40,10 @@
 
         self.url_dispatcher_files = dict()  # click-show-files and tests
         self.url_dispatcher = dict()
+
+        if self.manifest is None:
+            return
+
         for app in self.manifest['hooks']:
             if 'urls' not in self.manifest['hooks'][app]:
                 # msg("Skipped missing urls hook for '%s'" % app)
 
=== modified file 'clickreviews/tests/test_cr_content_hub.py'
--- clickreviews/tests/test_cr_content_hub.py	2015-10-16 02:54:07 +0000
+++ clickreviews/tests/test_cr_content_hub.py	2015-12-01 15:03:49 +0000
@@ -155,3 +155,28 @@
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
+
+    def test_check_valid_snappy_1504(self):
+        '''Test check_valid() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_content_hub(self.default_appname, "destination", "pictures")
+        self.set_test_content_hub(self.default_appname, "share", "pictures")
+        self.set_test_content_hub(self.default_appname, "source", "pictures")
+        c = ClickReviewContentHub(self.test_name)
+        c.check_valid()
+        r = c.click_report
+        expected_counts = {'info': 6, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_valid_snappy_1604(self):
+        '''Test check_valid() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_content_hub(self.default_appname, "destination", "pictures")
+        self.set_test_content_hub(self.default_appname, "share", "pictures")
+        self.set_test_content_hub(self.default_appname, "source", "pictures")
+        c = ClickReviewContentHub(self.test_name)
+        c.check_valid()
+        r = c.click_report
+        # should be empty with this pkgfmt
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
 
=== modified file 'clickreviews/tests/test_cr_desktop.py'
--- clickreviews/tests/test_cr_desktop.py	2015-10-16 02:54:07 +0000
+++ clickreviews/tests/test_cr_desktop.py	2015-12-01 15:03:49 +0000
@@ -896,3 +896,31 @@
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
+
+    def test_check_desktop_file_snappy_1504(self):
+        '''Test check_desktop_file() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        c = ClickReviewDesktop(self.test_name)
+        c.check_desktop_file()
+        r = c.click_report
+        expected = dict()
+        expected['info'] = dict()
+        expected['warn'] = dict()
+        expected['error'] = dict()
+        name = c._get_check_name('files_usable')
+        expected['info'][name] = {"text": "OK"}
+        self.check_results(r, expected=expected)
+
+    def test_check_desktop_file_snappy_1604(self):
+        '''Test check_desktop_file() -  snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        c = ClickReviewDesktop(self.test_name)
+        c.check_desktop_file()
+        r = c.click_report
+        expected = dict()
+        expected['info'] = dict()
+        expected['warn'] = dict()
+        expected['error'] = dict()
+        name = c._get_check_name('files_usable')
+        expected['info'][name] = {"text": "Skipped: could not find any desktop files"}
+        self.check_results(r, expected=expected)
 
=== modified file 'clickreviews/tests/test_cr_lint.py'
--- clickreviews/tests/test_cr_lint.py	2015-11-12 14:27:00 +0000
+++ clickreviews/tests/test_cr_lint.py	2015-12-01 15:03:49 +0000
@@ -143,7 +143,9 @@
     def test_check_architecture_nonexistent(self):
         '''Test check_architecture() - nonexistent'''
         self.set_test_control("Architecture", "nonexistent")
+        self.set_test_pkgfmt("click", "0.4")
         c = ClickReviewLint(self.test_name)
+        c.pkg_arch = ["nonexistent"]
         c.check_architecture()
         r = c.click_report
         expected_counts = {'info': 0, 'warn': 0, 'error': 1}
@@ -157,6 +159,25 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_control_architecture_snappy_1504(self):
+        '''Test check_control() (architecture) - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        c = ClickReviewLint(self.test_name)
+        c.check_control()
+        r = c.click_report
+        expected_counts = {'info': 15, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_control_architecture_snappy_1604(self):
+        '''Test check_control() (architecture) - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        c = ClickReviewLint(self.test_name)
+        c.check_control()
+        r = c.click_report
+        # should be empty with this pkgfmt
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_control_architecture_missing(self):
         '''Test check_control() (architecture missing)'''
         self.set_test_control("Architecture", None)
@@ -220,6 +241,7 @@
         self.set_test_control("Architecture", "armhf")
         self.set_test_manifest("architecture", "armhf")
         c = ClickReviewLint(self.test_name)
+        c.pkg_arch = ['armhf']
         c.pkg_bin_files = []
         c.check_architecture_specified_needed()
         r = c.click_report
@@ -237,90 +259,6 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
-    def test_check_package_filename(self):
-        '''Test check_package_filename()'''
-        c = ClickReviewLint(self.test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 0}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_missing_version(self):
-        '''Test check_package_filename() - missing version'''
-        test_name = "%s_%s.click" % (self.test_control['Package'],
-                                     self.test_control['Architecture'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 3, 'error': 1}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_missing_arch(self):
-        '''Test check_package_filename() - missing arch'''
-        test_name = "%s_%s.click" % (self.test_control['Package'],
-                                     self.test_control['Version'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 3, 'error': 0}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_missing_package(self):
-        '''Test check_package_filename() - missing package'''
-        test_name = "%s_%s.click" % (self.test_control['Version'],
-                                     self.test_control['Architecture'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 3, 'error': 1}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_extra_underscore(self):
-        '''Test check_package_filename() - extra underscore'''
-        test_name = "_%s_%s_%s.click" % (self.test_control['Package'],
-                                         self.test_control['Version'],
-                                         self.test_control['Architecture'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 2, 'error': 2}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_version_mismatches(self):
-        '''Test check_package_filename() (version mismatches filename)'''
-        self.set_test_control("Version", "100.1.1")
-        c = ClickReviewLint(self.test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 1}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_valid_arch(self):
-        '''Test check_package_filename() (valid arch)'''
-        arch = "armhf"
-        self.set_test_control("Architecture", arch)
-        test_name = "%s_%s_%s.click" % (self.test_control['Package'],
-                                        self.test_control['Version'],
-                                        self.test_control['Architecture'])
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 0}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_valid_arch_multi(self):
-        '''Test check_package_filename() (valid multi arch)'''
-        arch = "multi"
-        self.set_test_control("Architecture", arch)
-        test_name = "%s_%s_%s.click" % (self.test_control['Package'],
-                                        self.test_control['Version'],
-                                        arch)
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 0}
-        self.check_results(r, expected_counts)
-
     def test_check_manifest_missing_arch(self):
         '''Test check_manifest_architecture() (missing)'''
         self.set_test_manifest("architecture", None)
@@ -330,6 +268,26 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_manifest_missing_arch_snappy_1504(self):
+        '''Test check_manifest_architecture() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_manifest("architecture", None)
+        c = ClickReviewLint(self.test_name)
+        c.check_manifest_architecture()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_manifest_missing_arch_snappy_1604(self):
+        '''Test check_manifest_architecture() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("architecture", None)
+        c = ClickReviewLint(self.test_name)
+        c.check_manifest_architecture()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_manifest_arch_all(self):
         '''Test check_manifest_architecture() (all)'''
         self.set_test_manifest("architecture", "all")
@@ -455,27 +413,6 @@
         expected_counts = {'info': 0, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
 
-    def test_check_package_filename_mismatch_arch(self):
-        '''Test check_package_filename() (control mismatches arch)'''
-        arch = "armhf"
-        self.set_test_control("Architecture", "all")
-        test_name = "%s_%s_%s.click" % (self.test_control['Package'],
-                                        self.test_control['Version'],
-                                        arch)
-        c = ClickReviewLint(test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 1}
-        self.check_results(r, expected_counts)
-
-    def test_check_package_filename_with_extra_click(self):
-        """Test namespaces with the word "click" in them."""
-        c = ClickReviewLint(self.test_name)
-        c.check_package_filename()
-        r = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 0}
-        self.check_results(r, expected_counts)
-
     def test_check_control(self):
         """A very basic test to make sure check_control can be tested."""
         c = ClickReviewLint(self.test_name)
@@ -638,6 +575,26 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_icon_snappy_1504(self):
+        '''Test check_icon() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_manifest("icon", "someicon")
+        c = ClickReviewLint(self.test_name)
+        c.check_icon()
+        r = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_icon_snappy_1604(self):
+        '''Test check_icon() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("icon", "someicon")
+        c = ClickReviewLint(self.test_name)
+        c.check_icon()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_icon_unspecified(self):
         '''Test check_icon()'''
         self.set_test_manifest("icon", None)
@@ -714,6 +671,34 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_click_local_extensions_snappy_1504(self):
+        '''Testeck_click_local_extensions() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        for k in self.test_manifest.keys():
+            if k.startswith("x-"):
+                self.set_test_manifest(k, None)
+        self.set_test_manifest("x-source", {"vcs-bzr": "lp:notes-app",
+                                            "vcs-bzr-revno": "209"})
+        c = ClickReviewLint(self.test_name)
+        c.check_click_local_extensions()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 1, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_click_local_extensions_snappy_1604(self):
+        '''Testeck_click_local_extensions() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        for k in self.test_manifest.keys():
+            if k.startswith("x-"):
+                self.set_test_manifest(k, None)
+        self.set_test_manifest("x-source", {"vcs-bzr": "lp:notes-app",
+                                            "vcs-bzr-revno": "209"})
+        c = ClickReviewLint(self.test_name)
+        c.check_click_local_extensions()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_framework(self):
         '''Test check_framework()'''
         self.patch_frameworks()
@@ -748,6 +733,19 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_framework_multiple_snappy_1604(self):
+        '''Test check_framework() - snappy 16.04'''
+        self.patch_frameworks()
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("framework",
+                               "ubuntu-sdk-14.10-qml-dev2,ubuntu-core-15.04")
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        c.check_framework()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     @patch('clickreviews.remote.read_cr_file')
     def test_check_framework_fetches_remote_data(self, mock_read_cr_file):
         '''Test check_framework()'''
@@ -831,6 +829,27 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_hooks_snappy_1504(self):
+        '''Test check_hooks() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks()
+        r = c.click_report
+        expected_counts = {'info': 5, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_hooks_snappy_1604(self):
+        '''Test check_hooks() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks()
+        r = c.click_report
+        # this should be 0 with this pkgfmt
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_hooks_multiple_desktop_apps(self):
         '''Test check_hooks() - multiple desktop apps'''
         self.set_test_manifest("framework", "ubuntu-sdk-13.10")
@@ -950,6 +969,26 @@
         expected_counts = {'info': None, 'warn': 1, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_hooks_unknown_nonexistent_snappy_1504(self):
+        '''Test check_hooks_unknown() - nonexistent - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks_unknown()
+        r = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_hooks_unknown_nonexistent_snappy_1604(self):
+        '''Test check_hooks_unknown() - nonexistent - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks_unknown()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_hooks_unknown_good(self):
         '''Test check_hooks_unknown()'''
         self.set_test_manifest("framework", "ubuntu-sdk-13.10")
@@ -982,6 +1021,26 @@
         name = c._get_check_name('hooks_redflag', app='test-app')
         self.check_manual_review(r, name)
 
+    def test_check_hooks_redflagged_payui_snappy_1504(self):
+        '''Test check_hooks_redflagged() - pay-ui - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks_redflagged()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_hooks_redflagged_payui_snappy_1604(self):
+        '''Test check_hooks_redflagged() - pay-ui - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_manifest("framework", "ubuntu-sdk-13.10")
+        c = ClickReviewLint(self.test_name)
+        c.check_hooks_redflagged()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_hooks_redflagged_apparmor_profile(self):
         '''Test check_hooks_redflagged() - apparmor-profile'''
         self.set_test_manifest("framework", "ubuntu-sdk-13.10")
@@ -1036,6 +1095,28 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_snappy_name_toplevel_1504(self):
+        '''Test check_snappy_name - toplevel - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("name", "foo")
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        c.check_snappy_name()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_name_toplevel_1604(self):
+        '''Test check_snappy_name - toplevel - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("name", "foo")
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        c.check_snappy_name()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_snappy_name_flat(self):
         '''Test check_snappy_name - obsoleted flat'''
         self.set_test_pkg_yaml("name", "foo.bar")
@@ -1092,6 +1173,26 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
 
+    def test_snappy_version_1504(self):
+        '''Test check_snappy_version - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("version", 1)
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_version()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_version_1604(self):
+        '''Test check_snappy_version - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("version", 1)
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_version()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_snappy_version1(self):
         '''Test check_snappy_version - integer'''
         self.set_test_pkg_yaml("version", 1)
@@ -1191,6 +1292,26 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_snappy_type_app_1504(self):
+        '''Test check_snappy_type - app - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("type", "app")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_type_app_1604(self):
+        '''Test check_snappy_type - app - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("type", "app")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_snappy_type_framework(self):
         '''Test check_snappy_type - framework'''
         self.set_test_pkg_yaml("type", "framework")
@@ -1209,6 +1330,24 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_snappy_type_os(self):
+        '''Test check_snappy_type - os'''
+        self.set_test_pkg_yaml("type", "os")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_type_kernel(self):
+        '''Test check_snappy_type - kernel'''
+        self.set_test_pkg_yaml("type", "kernel")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_snappy_type_redflagged(self):
         '''Test check_snappy_type_redflagged - unspecified'''
         self.set_test_pkg_yaml("type", None)
@@ -1218,6 +1357,26 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_snappy_type_redflagged_1504(self):
+        '''Test check_snappy_type_redflagged - unspecified - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("type", None)
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type_redflagged()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_type_redflagged_1604(self):
+        '''Test check_snappy_type_redflagged - unspecified - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("type", None)
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type_redflagged()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_snappy_type_redflagged_app(self):
         '''Test check_snappy_type_redflagged - app'''
         self.set_test_pkg_yaml("type", "app")
@@ -1236,6 +1395,33 @@
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
 
+    def test_snappy_type_redflagged_oem(self):
+        '''Test check_snappy_type_redflagged - oem'''
+        self.set_test_pkg_yaml("type", "oem")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type_redflagged()
+        r = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 1}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_type_redflagged_os(self):
+        '''Test check_snappy_type_redflagged - os'''
+        self.set_test_pkg_yaml("type", "os")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type_redflagged()
+        r = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 1}
+        self.check_results(r, expected_counts)
+
+    def test_snappy_type_redflagged_kernel(self):
+        '''Test check_snappy_type_redflagged - kernel'''
+        self.set_test_pkg_yaml("type", "kernel")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_type_redflagged()
+        r = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 1}
+        self.check_results(r, expected_counts)
+
     def test_check_snappy_icon(self):
         '''Test check_snappy_icon()'''
         self.set_test_pkg_yaml("icon", "someicon")
@@ -1245,6 +1431,26 @@
         expected_counts = {'info': 3, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_snappy_icon_1504(self):
+        '''Test check_snappy_icon() - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("icon", "someicon")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_icon()
+        r = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_snappy_icon_1604(self):
+        '''Test check_snappy_icon() - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("icon", "someicon")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_icon()
+        r = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_snappy_icon_unspecified(self):
         '''Test check_snappy_icon() - unspecified'''
         self.set_test_pkg_yaml("icon", None)
@@ -1274,6 +1480,18 @@
 
     def test_check_snappy_missing_arch(self):
         '''Test check_snappy_architecture() (missing)'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("architectures", None)
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        c.check_snappy_architecture()
+        r = c.click_report
+        expected_counts = {'info': 2, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_snappy_missing_arch_1604(self):
+        '''Test check_snappy_architecture() (missing)'''
+        self.set_test_pkgfmt("snap", "16.04")
         self.set_test_pkg_yaml("architectures", None)
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1284,6 +1502,7 @@
 
     def test_check_snappy_arch_all_deprecated(self):
         '''Test check_snappy_architecture() (deprecated, all)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architecture", "all")
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1294,6 +1513,7 @@
 
     def test_check_snappy_arch_amd64_deprecated(self):
         '''Test check_snappy_architecture() (deprecated, all)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architecture", "amd64")
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1304,6 +1524,7 @@
 
     def test_check_snappy_arch_all(self):
         '''Test check_snappy_architecture() (all)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["all"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1314,6 +1535,7 @@
 
     def test_check_snappy_arch_single_armhf(self):
         '''Test check_snappy_architecture() (single arch, armhf)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["armhf"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1324,6 +1546,7 @@
 
     def test_check_snappy_arch_single_arm64(self):
         '''Test check_snappy_architecture() (single arch, arm64)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["arm64"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1334,6 +1557,7 @@
 
     def test_check_snappy_arch_single_i386(self):
         '''Test check_snappy_architecture() (single arch, i386)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["i386"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1344,6 +1568,7 @@
 
     def test_check_snappy_arch_single_amd64(self):
         '''Test check_snappy_architecture() (single arch, amd64)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["amd64"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1354,6 +1579,7 @@
 
     def test_check_snappy_arch_single_nonexistent(self):
         '''Test check_snappy_architecture() (single nonexistent arch)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["nonexistent"])
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1364,6 +1590,7 @@
 
     def test_check_snappy_arch_single_multi(self):
         '''Test check_snappy_architecture() (single arch: invalid multi)'''
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", "multi")
         c = ClickReviewLint(self.test_name)
         c.is_snap = True
@@ -1374,12 +1601,11 @@
 
     def test_check_snappy_valid_arch_multi(self):
         '''Test check_snappy_architecture() (valid multi)'''
-        arch = "multi"
+        self.set_test_pkgfmt("snap", "15.04")
         self.set_test_pkg_yaml("architectures", ["armhf"])
-        self.set_test_control("Architecture", arch)
         test_name = "%s_%s_%s.snap" % (self.test_control['Package'],
                                        self.test_control['Version'],
-                                       arch)
+                                       "armhf")
         c = ClickReviewLint(test_name)
         c.is_snap = True
         c.check_snappy_architecture()
@@ -1389,9 +1615,9 @@
 
     def test_check_snappy_valid_arch_multi2(self):
         '''Test check_snappy_architecture() (valid multi2)'''
+        self.set_test_pkgfmt("snap", "15.04")
         arch = "multi"
         self.set_test_pkg_yaml("architectures", ["armhf", "i386"])
-        self.set_test_control("Architecture", arch)
         test_name = "%s_%s_%s.snap" % (self.test_control['Package'],
                                        self.test_control['Version'],
                                        arch)
@@ -1404,9 +1630,9 @@
 
     def test_check_snappy_invalid_arch_multi_nonexistent(self):
         '''Test check_snappy_architecture() (invalid multi)'''
+        self.set_test_pkgfmt("snap", "15.04")
         arch = "multi"
         self.set_test_pkg_yaml("architectures", ["armhf", "nonexistent"])
-        self.set_test_control("Architecture", arch)
         test_name = "%s_%s_%s.snap" % (self.test_control['Package'],
                                        self.test_control['Version'],
                                        arch)
@@ -1419,9 +1645,9 @@
 
     def test_check_snappy_invalid_arch_multi_all(self):
         '''Test check_snappy_architecture() (invalid all)'''
+        self.set_test_pkgfmt("snap", "15.04")
         arch = "multi"
         self.set_test_pkg_yaml("architectures", ["armhf", "all"])
-        self.set_test_control("Architecture", arch)
         test_name = "%s_%s_%s.snap" % (self.test_control['Package'],
                                        self.test_control['Version'],
                                        arch)
@@ -1434,13 +1660,14 @@
 
     def test_check_snappy_invalid_arch_multi_multi(self):
         '''Test check_snappy_architecture() (invalid multi)'''
+        self.set_test_pkgfmt("snap", "15.04")
         arch = "multi"
         self.set_test_pkg_yaml("architectures", ["multi", "armhf"])
-        self.set_test_control("Architecture", arch)
         test_name = "%s_%s_%s.snap" % (self.test_control['Package'],
                                        self.test_control['Version'],
                                        arch)
         c = ClickReviewLint(test_name)
+        c.is_snap = True
         c.check_snappy_architecture()
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
@@ -1455,6 +1682,26 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_snappy_unknown_entries_1504(self):
+        '''Test check_snappy_unknown_entries - none - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_pkg_yaml("name", "foo")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_unknown_entries()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_snappy_unknown_entries_1604(self):
+        '''Test check_snappy_unknown_entries - none - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_pkg_yaml("name", "foo")
+        c = ClickReviewLint(self.test_name)
+        c.check_snappy_unknown_entries()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_snappy_unknown_entries2(self):
         '''Test check_snappy_unknown_entries - one'''
         self.set_test_pkg_yaml("nonexistent", "bar")
@@ -1653,6 +1900,33 @@
         expected_counts = {'info': 4, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_snappy_hashes_1504(self):
+        '''Test check_snappy_hashes() - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        yaml = self._create_hashes_yaml()
+        c.pkg_files = self._test_pkg_files
+        self.set_test_hashes_yaml(yaml)
+        c.check_snappy_hashes()
+        r = c.click_report
+        expected_counts = {'info': 4, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_snappy_hashes_1604(self):
+        '''Test check_snappy_hashes() - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        c = ClickReviewLint(self.test_name)
+        c.is_snap = True
+        yaml = self._create_hashes_yaml()
+        c.pkg_files = self._test_pkg_files
+        self.set_test_hashes_yaml(yaml)
+        c.check_snappy_hashes()
+        r = c.click_report
+        # this should be empty with this package format
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_snappy_hashes_archive_files_missing_name(self):
         '''Test check_snappy_hashes() - missing name'''
         c = ClickReviewLint(self.test_name)
 
=== modified file 'clickreviews/tests/test_cr_online_accounts.py'
--- clickreviews/tests/test_cr_online_accounts.py	2015-11-27 09:04:43 +0000
+++ clickreviews/tests/test_cr_online_accounts.py	2015-12-01 15:03:49 +0000
@@ -270,6 +270,30 @@
         expected_counts = {'info': 4, 'warn': 0, 'error': 0}
         self.check_results(r, expected_counts)
 
+    def test_check_application_snappy_1504(self):
+        '''Test check_application() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        xml = self._stub_application()
+        # print(etree.tostring(xml))
+        self.set_test_account(self.default_appname, "account-application", xml)
+        c = ClickReviewAccounts(self.test_name)
+        c.check_application()
+        r = c.click_report
+        expected_counts = {'info': 4, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_application_snappy_1604(self):
+        '''Test check_application() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        xml = self._stub_application()
+        # print(etree.tostring(xml))
+        self.set_test_account(self.default_appname, "account-application", xml)
+        c = ClickReviewAccounts(self.test_name)
+        c.check_application()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
     def test_check_application_not_specified(self):
         '''Test check_application() - not specified'''
         c = ClickReviewAccounts(self.test_name)
 
=== modified file 'clickreviews/tests/test_cr_push_helper.py'
--- clickreviews/tests/test_cr_push_helper.py	2015-10-16 02:54:07 +0000
+++ clickreviews/tests/test_cr_push_helper.py	2015-12-01 15:03:49 +0000
@@ -201,3 +201,23 @@
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
+
+    def test_check_valid_exec_snappy_1504(self):
+        '''Test check_valid() - exec - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_push_helper(self.default_appname, "exec", "foo")
+        c = ClickReviewPushHelper(self.test_name)
+        c.check_valid()
+        r = c.click_report
+        expected_counts = {'info': 2, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_valid_exec_snappy_1604(self):
+        '''Test check_valid() - exec - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_push_helper(self.default_appname, "exec", "foo")
+        c = ClickReviewPushHelper(self.test_name)
+        c.check_valid()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
 
=== modified file 'clickreviews/tests/test_cr_scope.py'
--- clickreviews/tests/test_cr_scope.py	2015-12-01 07:45:05 +0000
+++ clickreviews/tests/test_cr_scope.py	2015-12-01 15:03:49 +0000
@@ -281,3 +281,27 @@
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
+
+    def test_check_scope_ini_snappy_1504(self):
+        '''Test check_scope_ini() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        scope = self._create_scope(self._stub_config())
+
+        self.set_test_scope(self.default_appname, scope)
+        c = ClickReviewScope(self.test_name)
+        c.check_scope_ini()
+        r = c.click_report
+        expected_counts = {'info': 4, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_scope_ini_snappy_1604(self):
+        '''Test check_scope_ini() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        scope = self._create_scope(self._stub_config())
+
+        self.set_test_scope(self.default_appname, scope)
+        c = ClickReviewScope(self.test_name)
+        c.check_scope_ini()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
 
=== modified file 'clickreviews/tests/test_cr_security.py'
--- clickreviews/tests/test_cr_security.py	2015-11-11 15:40:49 +0000
+++ clickreviews/tests/test_cr_security.py	2015-12-01 15:03:49 +0000
@@ -41,14 +41,41 @@
 
     def test_check_policy_version_vendor(self):
         '''Test check_policy_version() - valid'''
-        for v in [1.0]:  # update when have more vendor policy
-            c = ClickReviewSecurity(self.test_name)
-            self.set_test_security_manifest(self.default_appname,
-                                            "policy_version", v)
-            c.check_policy_version()
-            report = c.click_report
-            expected_counts = {'info': 3, 'warn': 0, 'error': 0}
-            self.check_results(report, expected_counts)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_version", 1.0)
+        c.check_policy_version()
+        report = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_policy_version_vendor_snappy_1504(self):
+        '''Test check_policy_version() - valid - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        n = "bin/%s" % self.default_appname
+        self._set_yaml_binary([('caps', ['network-client'])], name=n)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_security_manifest("binaries/%s" % n,
+                                        "policy_version", 1.0)
+        c.check_policy_version()
+        report = c.click_report
+        expected_counts = {'info': 3, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_policy_version_vendor_snappy_1604(self):
+        '''Test check_policy_version() - valid - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        n = "bin/%s" % self.default_appname
+        self._set_yaml_binary([('caps', ['network-client'])], name=n)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_security_manifest("binaries/%s" % n,
+                                        "policy_vendor", "ubuntu-core")
+        self.set_test_security_manifest("binaries/%s" % n,
+                                        "policy_version", 15.04)
+        c.check_policy_version()
+        report = c.click_report
+        expected_counts = {'info': 2, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
 
     def test_check_policy_version_highest(self):
         '''Test check_policy_version() - highest'''
@@ -273,6 +300,32 @@
         expected_counts = {'info': 2, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_policy_vendor_ubuntu_1504(self):
+        '''Test check_policy_vendor() - ubuntu - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        n = "bin/%s" % self.default_appname
+        self._set_yaml_binary([('caps', ['network-client'])], name=n)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_security_manifest("binaries/%s" % n,
+                                        "policy_vendor", "ubuntu")
+        c.check_policy_vendor()
+        report = c.click_report
+        expected_counts = {'info': 2, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_policy_vendor_ubuntu_1604(self):
+        '''Test check_policy_vendor() - ubuntu - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        n = "bin/%s" % self.default_appname
+        self._set_yaml_binary([('caps', ['network-client'])], name=n)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_security_manifest("binaries/%s" % n,
+                                        "policy_vendor", "ubuntu")
+        c.check_policy_vendor()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_policy_vendor_ubuntu(self):
         '''Test check_policy_vendor() - ubuntu'''
         c = ClickReviewSecurity(self.test_name)
@@ -975,18 +1028,36 @@
         self.set_test_security_manifest(self.default_appname,
                                         "policy_groups",
                                         ["push-notification-client"])
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-push-helper")
         c = ClickReviewSecurity(self.test_name)
         c.check_policy_groups_push_helpers()
         report = c.click_report
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_policy_groups_pushhelper_wrong_template(self):
+        '''Test check_policy_groups_pushhelper()'''
+        self.set_test_push_helper(self.default_appname, "exec", "foo")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_groups",
+                                        ["push-notification-client"])
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-sdk")
+        c = ClickReviewSecurity(self.test_name)
+        c.check_policy_groups_push_helpers()
+        report = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_policy_groups_pushhelper_missing(self):
         '''Test check_policy_groups_pushhelper - missing'''
         self.set_test_push_helper(self.default_appname, "exec", "foo")
         self.set_test_security_manifest(self.default_appname,
                                         "policy_groups",
                                         None)
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-push-helper")
         c = ClickReviewSecurity(self.test_name)
         c.check_policy_groups_push_helpers()
         report = c.click_report
@@ -1001,6 +1072,8 @@
                                         ["video_files",
                                          "networking",
                                          "push-notification-client"])
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-push-helper")
         c = ClickReviewSecurity(self.test_name)
         c.check_policy_groups_push_helpers()
         report = c.click_report
@@ -1014,64 +1087,14 @@
                                         "policy_groups",
                                         ["networking",
                                          "push-notification-client"])
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-push-helper")
         c = ClickReviewSecurity(self.test_name)
         c.check_policy_groups_push_helpers()
         report = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(report, expected_counts)
 
-    def test_check_template_pushhelper(self):
-        '''Test check_template_pushhelper'''
-        self.set_test_push_helper(self.default_appname, "exec", "foo")
-        self.set_test_security_manifest(self.default_appname,
-                                        "template", "ubuntu-push-helper")
-        self.set_test_security_manifest(self.default_appname,
-                                        "policy_groups",
-                                        ["push-notification-client"])
-        c = ClickReviewSecurity(self.test_name)
-        c.check_template_push_helpers()
-        report = c.click_report
-        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
-        self.check_results(report, expected_counts)
-
-    def test_check_template_pushhelper_no_hook(self):
-        '''Test check_template_pushhelper'''
-        self.set_test_security_manifest(self.default_appname,
-                                        "template", "ubuntu-sdk")
-        c = ClickReviewSecurity(self.test_name)
-        c.check_template_push_helpers()
-        report = c.click_report
-        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
-        self.check_results(report, expected_counts)
-
-    def test_check_template_pushhelper_wrong_template(self):
-        '''Test check_template_pushhelper - wrong template'''
-        self.set_test_push_helper(self.default_appname, "exec", "foo")
-        self.set_test_security_manifest(self.default_appname,
-                                        "template", "ubuntu-webapp")
-        self.set_test_security_manifest(self.default_appname,
-                                        "policy_groups",
-                                        ["push-notification-client"])
-        c = ClickReviewSecurity(self.test_name)
-        c.check_template_push_helpers()
-        report = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 1}
-        self.check_results(report, expected_counts)
-
-    def test_check_template_pushhelper_wrong_template2(self):
-        '''Test check_template_pushhelper - default template'''
-        self.set_test_push_helper(self.default_appname, "exec", "foo")
-        self.set_test_security_manifest(self.default_appname,
-                                        "template", None)
-        self.set_test_security_manifest(self.default_appname,
-                                        "policy_groups",
-                                        ["push-notification-client"])
-        c = ClickReviewSecurity(self.test_name)
-        c.check_template_push_helpers()
-        report = c.click_report
-        expected_counts = {'info': None, 'warn': 0, 'error': 1}
-        self.check_results(report, expected_counts)
-
     def test_check_peer_hooks(self):
         '''Test check_peer_hooks()'''
         c = ClickReviewSecurity(self.test_name)
@@ -1267,6 +1290,25 @@
         expected_counts = {'info': 5, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_apparmor_profile_1604(self):
+        '''Test check_apparmor_profile() - snappy 16.04'''
+        policy = '''
+###VAR###
+###PROFILEATTACH### {
+  #include <abstractions/base>
+  # Read-only for the install directory
+  @{CLICK_DIR}/@{APP_PKGNAME}/@{APP_VERSION}/**  mrklix,
+  @{INSTALL_DIR}/@{APP_PKGNAME}/@{APP_VERSION}/**  mrklix,
+}
+'''
+        self.set_test_security_profile(self.default_appname, policy)
+        c = ClickReviewSecurity(self.test_name)
+        self.set_test_pkgfmt("snap", "16.04")
+        c.check_apparmor_profile()
+        report = c.click_report
+        expected_counts = {'info': 6, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_apparmor_profile_missing_var(self):
         '''Test check_apparmor_profile() - missing ###VAR###'''
         policy = '''
@@ -1366,6 +1408,30 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_security_template_nondefault_1504(self):
+        '''Test check_security_template() - nondefault - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "nondefault")
+        self._set_yaml_binary([('security-template', 'nondefault')])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_template()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_template_nondefault_1604(self):
+        '''Test check_security_template() - nondefault - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "nondefault")
+        self._set_yaml_binary([('security-template', 'nondefault')])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_template()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_security_template_bad(self):
         '''Test check_security_template() - {}'''
         self._set_yaml_binary([('security-template', {})])
@@ -1455,6 +1521,33 @@
         expected_counts = {'info': 5, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_security_yaml_and_click_snappy_1504(self):
+        '''Test check_security_yaml_and_click() - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self._set_yaml_binary([('caps', ['networking'])],
+                              name="bin/%s" % self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+
+        # update the manifest and test_manifest
+        c.manifest["hooks"][self.default_appname]['bin-path'] = "bin/path"
+
+        c.check_security_yaml_and_click()
+        report = c.click_report
+        expected_counts = {'info': 5, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_and_click_snappy_1604(self):
+        '''Test check_security_yaml_and_click() - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('caps', ['networking'])],
+                              name="bin/%s" % self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+
+        c.check_security_yaml_and_click()
+        report = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_security_yaml_and_click_name_exec(self):
         '''Test check_security_yaml_and_click() - uses exec'''
         self._set_yaml_binary([('caps', ['networking']),
@@ -1923,6 +2016,28 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_security_yaml_override_and_click_1504(self):
+        '''Test check_security_yaml_override_and_click() - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_security_manifest(self.default_appname, "template", None)
+        self._set_yaml_binary([])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override_and_click()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override_and_click_1604(self):
+        '''Test check_security_yaml_override_and_click() - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_security_manifest(self.default_appname, "template", None)
+        self._set_yaml_binary([])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override_and_click()
+        report = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_security_yaml_override_and_click_bad(self):
         '''Test check_security_yaml_override_and_click() - bad'''
         self.set_test_security_manifest(self.default_appname, "template", None)
@@ -1945,8 +2060,31 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_security_yaml_override_1504(self):
+        '''Test check_security_yaml_override() - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_security_manifest(self.default_appname, "template", None)
+        self._set_yaml_binary([])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override_1604(self):
+        '''Test check_security_yaml_override() - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_security_manifest(self.default_appname, "template", None)
+        self._set_yaml_binary([])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_security_yaml_override2(self):
         '''Test check_security_yaml_override() - seccomp/apparmor specified'''
+        self.set_test_pkgfmt("snap", "15.04")
         self._set_yaml_binary([('security-override', {'apparmor': 'aa',
                                                       'seccomp': 'sc'})],
                               name=self.default_appname)
@@ -1956,6 +2094,84 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_security_yaml_override3(self):
+        '''Test check_security_yaml_override() - seccomp/apparmor specified
+           with 16.04
+        '''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('security-override', {'apparmor': 'aa',
+                                                      'seccomp': 'sc'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 2}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override4(self):
+        '''Test check_security_yaml_override() - syscalls specified with
+           15.04
+        '''
+        self.set_test_pkgfmt("snap", "15.04")
+        self._set_yaml_binary([('security-override', {'syscalls': 'foo'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        expected_counts = {'info': None, 'warn': 0, 'error': 1}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override5(self):
+        '''Test check_security_yaml_override() - syscalls specified with
+           16.04
+        '''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('security-override', {'syscalls': 'foo'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        # the error is security-override not allowed
+        expected_counts = {'info': 1, 'warn': 0, 'error': 1}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override6(self):
+        '''Test check_security_yaml_override() - read-paths'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('security-override', {'read-paths': '/foo'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        # the error is security-override not allowed
+        expected_counts = {'info': 1, 'warn': 0, 'error': 1}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override7(self):
+        '''Test check_security_yaml_override() - write-paths'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('security-override', {'write-paths': '/foo'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        # the error is security-override not allowed
+        expected_counts = {'info': 1, 'warn': 0, 'error': 1}
+        self.check_results(report, expected_counts)
+
+    def test_check_security_yaml_override8(self):
+        '''Test check_security_yaml_override() - abstractions'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self._set_yaml_binary([('security-override',
+                                {'abstractions': '/foo'})],
+                              name=self.default_appname)
+        c = ClickReviewSecurity(self.test_name)
+        c.check_security_yaml_override()
+        report = c.click_report
+        # the error is security-override not allowed
+        expected_counts = {'info': 1, 'warn': 0, 'error': 1}
+        self.check_results(report, expected_counts)
+
     def test_check_security_yaml_override_missing1(self):
         '''Test check_security_yaml_override() - missing apparmor'''
         self._set_yaml_binary([('security-override', {'seccomp': 'sc'})],
@@ -2049,6 +2265,34 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_template_online_account_provider_1504(self):
+        '''Test check_template_online_account_provider - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_account(self.default_appname, "account-provider", "foo")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-account-plugin")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_groups", ["accounts"])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_template_online_accounts_provider()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_template_online_account_provider_1604(self):
+        '''Test check_template_online_account_provider - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_account(self.default_appname, "account-provider", "foo")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-account-plugin")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_groups", ["accounts"])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_template_online_accounts_provider()
+        report = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_template_online_account_provider_no_hook(self):
         '''Test check_template_online_account_provider'''
         self.set_test_security_manifest(self.default_appname,
@@ -2099,6 +2343,36 @@
         expected_counts = {'info': 1, 'warn': 0, 'error': 0}
         self.check_results(report, expected_counts)
 
+    def test_check_template_online_account_qml_plugin_1504(self):
+        '''Test check_template_online_account_qml_plugin - 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_account(self.default_appname,
+                              "account-qml-plugin", "foo")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-account-plugin")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_groups", ["accounts"])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_template_online_accounts_qml_plugin()
+        report = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
+    def test_check_template_online_account_qml_plugin_1604(self):
+        '''Test check_template_online_account_qml_plugin - 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_account(self.default_appname,
+                              "account-qml-plugin", "foo")
+        self.set_test_security_manifest(self.default_appname,
+                                        "template", "ubuntu-account-plugin")
+        self.set_test_security_manifest(self.default_appname,
+                                        "policy_groups", ["accounts"])
+        c = ClickReviewSecurity(self.test_name)
+        c.check_template_online_accounts_qml_plugin()
+        report = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(report, expected_counts)
+
     def test_check_template_online_account_qml_plugin_no_hook(self):
         '''Test check_template_online_account_qml_plugin'''
         self.set_test_security_manifest(self.default_appname,
@@ -2139,8 +2413,6 @@
 
     def test_check_policy_groups_ubuntu_account_plugin_no_hook(self):
         '''Test check_policy_groups_ubuntu_account_plugin() - no hook'''
-        self.set_test_security_manifest(self.default_appname,
-                                        "template", "ubuntu-account-plugin")
         c = ClickReviewSecurity(self.test_name)
         c.check_policy_groups_ubuntu_account_plugin()
         report = c.click_report
 
=== modified file 'clickreviews/tests/test_cr_url_dispatcher.py'
--- clickreviews/tests/test_cr_url_dispatcher.py	2015-10-16 02:54:07 +0000
+++ clickreviews/tests/test_cr_url_dispatcher.py	2015-12-01 15:03:49 +0000
@@ -255,3 +255,27 @@
         r = c.click_report
         expected_counts = {'info': None, 'warn': 0, 'error': 1}
         self.check_results(r, expected_counts)
+
+    def test_check_required_snappy_1504(self):
+        '''Test check_required() - has protocol - snappy 15.04'''
+        self.set_test_pkgfmt("snap", "15.04")
+        self.set_test_url_dispatcher(self.default_appname,
+                                     key="protocol",
+                                     value="some-protocol")
+        c = ClickReviewUrlDispatcher(self.test_name)
+        c.check_required()
+        r = c.click_report
+        expected_counts = {'info': 1, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
+
+    def test_check_required_snappy_1604(self):
+        '''Test check_required() - has protocol - snappy 16.04'''
+        self.set_test_pkgfmt("snap", "16.04")
+        self.set_test_url_dispatcher(self.default_appname,
+                                     key="protocol",
+                                     value="some-protocol")
+        c = ClickReviewUrlDispatcher(self.test_name)
+        c.check_required()
+        r = c.click_report
+        expected_counts = {'info': 0, 'warn': 0, 'error': 0}
+        self.check_results(r, expected_counts)
 
=== modified file 'clickreviews/tests/utils.py'
--- clickreviews/tests/utils.py	2015-10-21 22:12:25 +0000
+++ clickreviews/tests/utils.py	2015-12-01 15:03:49 +0000
@@ -22,31 +22,36 @@
 import tempfile
 
 
-def make_package(name='test', package_format='click', package_types=None,
-                 version='1.0', title="An application",
-                 framework='ubuntu-sdk-15.04', extra_files=None, output_dir=None):
+def make_package(name='test', pkgfmt_type='click', pkgfmt_version='0.4',
+                 package_types=None, version='1.0', title="An application",
+                 framework='ubuntu-sdk-15.04', extra_files=None,
+                 output_dir=None):
     """Return the path to a click/snap package with the given data.
 
     Caller is responsible for deleting the output_dir afterwards.
     """
-    is_snap = (package_format == "snap")
+    is_snap = (pkgfmt_type == "snap")
     build_dir = tempfile.mkdtemp()
     package_types = package_types or []
 
     try:
-        make_dir_structure(build_dir, extra_files=extra_files)
+        make_dir_structure(build_dir, pkgfmt_type=pkgfmt_type,
+                           pkgfmt_version=pkgfmt_version,
+                           extra_files=extra_files)
         write_icon(build_dir)
-        write_manifest(build_dir, name, version,
-                       title, framework, package_types,
-                       is_snap)
-        if is_snap:
-            write_meta_data(build_dir, name, version,
-                            title, framework)
-        write_control(build_dir, name, version, title)
-        write_preinst(build_dir)
-        write_apparmor_profile(build_dir, name)
-        write_other_files(build_dir)
-        pkg_path = build_package(build_dir, name, version, package_format,
+
+        if pkgfmt_type == 'click' or pkgfmt_version == 15.04:
+            write_manifest(build_dir, name, version,
+                           title, framework, package_types,
+                           is_snap)
+            write_control(build_dir, name, version, title, pkgfmt_version)
+            write_preinst(build_dir)
+            write_apparmor_profile(build_dir, name)
+            write_other_files(build_dir)
+        else:
+            write_meta_data(build_dir, name, version, title, framework)
+
+        pkg_path = build_package(build_dir, name, version, pkgfmt_type,
                                  output_dir=output_dir)
     finally:
         shutil.rmtree(build_dir)
@@ -54,9 +59,12 @@
     return pkg_path
 
 
-def make_dir_structure(path, extra_files=None):
+def make_dir_structure(path, pkgfmt_type, pkgfmt_version, extra_files=None):
     extra_files = extra_files or []
-    directories = ['DEBIAN', 'meta']
+    directories = ['meta']
+    if pkgfmt_type == 'click' or pkgfmt_version == 15.04:
+        directories.append('DEBIAN')
+
     directories.extend(
         [os.path.dirname(extra_file) for extra_file in extra_files])
 
@@ -128,11 +136,11 @@
         f.write(title)
 
 
-def write_control(path, name, version, title):
+def write_control(path, name, version, title, pkgfmt_version):
     control_path = os.path.join(path, 'DEBIAN', 'control')
     control_content = {'Package': name,
                        'Version': version,
-                       'Click-Version': '0.4',
+                       'Click-Version': pkgfmt_version,
                        'Architecture': 'all',
                        'Maintainer': 'Someone <[e-mail]>',
                        'Installed-Size': '123',
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-12-01 14:44:03 +0000
+++ debian/changelog	2015-12-01 15:03:49 +0000
@@ -19,8 +19,37 @@
     - 'Maintainer' checks in the click manifest should only be done with click
       packages (LP: #1510522)
     - don't prompt manual review when find .excludes file
+    - add kernel and os as valid snap types
+    - remove package filename checks. They were meaningless and hard to
+      maintain
+    - sort unknown snappy yaml keys
+  * clickreviews/cr_common.py:
+    - add valid yaml keys for kernel snaps
   * update data/apparmor-easyprof-ubuntu.json for 16.04 policy
   * Makefile: add json syntax check
+  * several changes for squashfs snaps that won't have a click manifest, etc.
+    Importantly, this means that only package.yaml is looked at and a lot of
+    click specific tests can be skipped
+    - cr_common.py:
+      + rename a few variable to not be click specific
+      + add self.pkgfmt
+      + adjust __init__() to conditionally use package.yaml on squashfs,
+        otherwise click manifest
+      + make click data structure initialization conditional on if click
+        or not (eg, don't run hooks code on squashfs images)
+    - adjust clickreviews/cr_* to conditionally run certain click-only tests
+      on click packages
+    - adjust architecture checks to use self.pkg_arch and rename
+      control_architecture_specified_needed as architecture_specified_needed
+    - cr_security.py:
+      + revamp to use package.yaml on non-click instead of now nonexistent
+        security manifest
+      + update push-helper template test to not make hooks specific
+      + network-client should not be allowed with push helpers either
+      + conditionally look for INSTALL_DIR on 16.04 systems in security-policy
+      + adjust security-override checks on 16.04 to follow 16.04 yaml
+      + make click manifest checks conditional on if click
+    - cr_tests.py: mock _pkgfmt_type(), _pkgfmt_version() and _is_squashfs()
 
   [ Michael Nelson ]
   * add support for non-mocked tests