Merge lp:~unity-api-team/click/scope-facing-apis into lp:click

[Pete Woods]

Add scope-facing APIs to chroot build

Add scope-facing APIs to chroot build

[Pete Woods (pete-woods)]

I've tried creating a new chroot from this, and it successfully builds the new scopes template from the SDK: https://code.launchpad.net/~pete-woods/qtcreator-plugin-ubuntu/new-scope-template/+merge/233218

[lp:~unity-api-team/click/scope-facing-apis]

512. By Daniel Holbach on 2014-09-05

Run click-review from click-reviewers-tools as part of the "click build" run. Offer --no-validate option.

Approved by PS Jenkins bot, zbenjamin, Colin Watson.

513. By Colin Watson on 2014-09-05

typo

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:444
http://jenkins.qa.ubuntu.com/job/click-ci/17/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/click-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/click-ci/17/rebuild

review: Approve (continuous-integration)

[lp:~unity-api-team/click/scope-facing-apis]

514. By Michael Vogt on 2014-09-05

Make the PackageKit plugin honour the PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED flag. Fixes: https://bugs.launchpad.net/bugs/1360582.

Approved by Colin Watson, PS Jenkins bot.

[Michael Vogt (mvo)]

This looks good, however there are two libraries that are in universe right now, I'm not sure what our policy is here and if we need a MIR (Colin will know).

[lp:~unity-api-team/click/scope-facing-apis]

515. By Colin Watson on 2014-09-09

merge 0.4.32 release

516. By Colin Watson on 2014-09-09

[r=cjwatson] Fix autopkgtests

[Colin Watson (cjwatson)]

We don't need an MIR for these at this point - we have other things in universe.

[Michael Vogt (mvo)]

review: Approve

[Sergio Schvezov (sergiusens)]

isn't this supposed to target the staging/devel click?

[Colin Watson (cjwatson)]

Er, yes, please resubmit this against lp:click/devel.

review: Needs Resubmitting

[lp:~unity-api-team/click/scope-facing-apis]

517. By Pete Woods on 2014-09-09

Add scope-facing libraries

Unmerged revisions

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-08-06 22:38:57 +0000
+++ click/chroot.py	2014-09-09 18:07:23 +0000
@@ -77,6 +77,11 @@
         ],
     "ubuntu-sdk-14.04": [
         "cmake",
+        "google-mock:TARGET",
+        "libboost1.55-dev:TARGET",
+        "libjsoncpp-dev:TARGET",
+        "libprocess-cpp-dev:TARGET",
+        "libproperties-cpp-dev:TARGET",
         "libqt5svg5-dev:TARGET",
         "libqt5webkit5-dev:TARGET",
         "libqt5xmlpatterns5-dev:TARGET",
@@ -99,7 +104,13 @@
         ],
     "ubuntu-sdk-14.10": [
         "cmake",
+        "google-mock:TARGET",
+        "libboost1.55-dev:TARGET",
         "libcontent-hub-dev:TARGET",
+        "libjsoncpp-dev:TARGET",
+        "libnet-cpp-dev:TARGET",
+        "libprocess-cpp-dev:TARGET",
+        "libproperties-cpp-dev:TARGET",
         "libqt5keychain0:TARGET",
         "libqt5sensors5-dev:TARGET",
         "libqt5svg5-dev:TARGET",

=== modified file 'click/commands/build.py'
--- click/commands/build.py	2013-12-06 11:04:47 +0000
+++ click/commands/build.py	2014-09-09 18:07:23 +0000
@@ -20,7 +20,9 @@
 from optparse import OptionParser
 import os
 import sys
+import subprocess
 
+from gi.repository import Click
 from click.build import ClickBuildError, ClickBuilder
 
 
@@ -29,6 +31,9 @@
     parser.add_option(
         "-m", "--manifest", metavar="PATH", default="manifest.json",
         help="read package manifest from PATH (default: manifest.json)")
+    parser.add_option(
+        "--no-validate", action="store_false", default=True, dest="validate",
+        help="Don't run click-reviewers-tools check on resulting .click")
     options, args = parser.parse_args(argv)
     if len(args) < 1:
         parser.error("need directory")
@@ -48,5 +53,20 @@
     except ClickBuildError as e:
         print(e, file=sys.stderr)
         return 1
+    if options.validate and Click.find_on_path('click-review'):
+        print("Now executing: click-review %s" % path)
+        try:
+            subprocess.check_call(['click-review', path])
+        except subprocess.CalledProcessError:
+            # qtcreator-plugin-ubuntu relies on return code 0
+            # to establish if a .click package has been built
+            # at all.
+            #
+            # If we want to distinguish between
+            # - click build failed
+            # - click build succeeded, but validation failed
+            # both tools will have to learn this at the same
+            # time.
+            pass
     print("Successfully built package in '%s'." % path)
     return 0

=== modified file 'click/install.py'
--- click/install.py	2014-08-20 17:45:26 +0000
+++ click/install.py	2014-09-09 18:07:23 +0000
@@ -177,6 +177,15 @@
             logging.warning(
                 "debsig-verify not available; cannot check signatures")
 
+        # fail early if the file cannot be opened
+        try:
+            with closing(DebFile(filename=path)) as package:
+                pass
+        except Exception as e:
+            raise ClickInstallerError("Failed to read %s: %s" % (
+                path, str(e)))
+
+        # then perform the audit
         with closing(DebFile(filename=path)) as package:
             control_fields = package.control.debcontrol()
 

=== renamed directory 'tests/integration' => 'click/tests/integration'
=== modified file 'click/tests/integration/helpers.py'
--- tests/integration/helpers.py	2014-08-03 13:10:48 +0000
+++ click/tests/integration/helpers.py	2014-09-09 18:07:23 +0000
@@ -27,13 +27,17 @@
 import unittest
 
 
-def is_root():
-    return os.getuid() == 0
-
-
-def has_network():
-    return subprocess.call(
-        ["ping", "-c1", "archive.ubuntu.com"]) == 0
+def require_root():
+    if os.getuid() != 0:
+        raise unittest.SkipTest("This test needs to run as root")
+
+
+def require_network():
+    try:
+        if subprocess.call(["ping", "-c1", "archive.ubuntu.com"]) != 0:
+            raise unittest.SkipTest("Need network")
+    except Exception:
+        pass
 
 
 @contextlib.contextmanager
@@ -46,10 +50,21 @@
         os.chdir(curdir)
 
 
+def cmdline_for_user(username):
+    """Helper to get the click commandline for the given username"""
+    if username == "@all":
+        user = "--all-users"
+    else:
+        user = "--user=%s" % username
+    return user
+
+
 class ClickTestCase(unittest.TestCase):
 
     @classmethod
     def setUpClass(cls):
+        if "TEST_INTEGRATION" not in os.environ:
+            raise unittest.SkipTest("Skipping integration tests")
         cls.click_binary = os.environ.get("CLICK_BINARY", "/usr/bin/click")
 
     def setUp(self):
@@ -63,6 +78,20 @@
         self.doCleanups()
         shutil.rmtree(self.temp_dir)
 
+    def click_install(self, path_to_click, click_name, username,
+                      allow_unauthenticated=True):
+        cmd = [self.click_binary, "install", cmdline_for_user(username)]
+        if allow_unauthenticated:
+            cmd.append("--allow-unauthenticated")
+        cmd.append(path_to_click)
+        subprocess.check_call(cmd)
+        self.addCleanup(self.click_unregister, click_name, username)
+
+    def click_unregister(self, click_name, username):
+        subprocess.check_call(
+            [self.click_binary, "unregister", cmdline_for_user(username),
+             click_name])
+
     def _create_manifest(self, target, name, version, framework, hooks={}):
         with open(target, "w") as f:
             json.dump({
@@ -77,7 +106,7 @@
     def _make_click(self, name=None, version=1.0,
                     framework="ubuntu-sdk-13.10", hooks={}):
         if name is None:
-            name = "com.ubuntu.%s" % "".join(
+            name = "com.example.%s" % "".join(
                 random.choice(string.ascii_lowercase) for i in range(10))
         tmpdir = tempfile.mkdtemp()
         self.addCleanup(lambda: shutil.rmtree(tmpdir))

=== modified file 'click/tests/integration/test_build_core_apps.py'
--- tests/integration/test_build_core_apps.py	2014-08-03 13:10:48 +0000
+++ click/tests/integration/test_build_core_apps.py	2014-09-09 18:07:23 +0000
@@ -20,12 +20,13 @@
 import os
 import shutil
 import subprocess
-import unittest
+
+from six import with_metaclass
 
 from .helpers import (
     chdir,
-    has_network,
-    is_root,
+    require_network,
+    require_root,
     ClickTestCase,
 )
 
@@ -63,9 +64,13 @@
         return type.__new__(cls, name, bases, dct)
 
 
[e-mail](not is_root(), "This tests needs to run as root")
[e-mail](not has_network(), "Need network")
-class TestBuildCoreApps(ClickTestCase, metaclass=AddBranchTestFunctions):
+class TestBuildCoreApps(with_metaclass(AddBranchTestFunctions, ClickTestCase)):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestBuildCoreApps, cls).setUpClass()
+        require_root()
+        require_network()
 
     def _run_in_chroot(self, cmd):
         """Run the given cmd in a click chroot"""

=== modified file 'click/tests/integration/test_chroot.py'
--- tests/integration/test_chroot.py	2014-08-03 13:10:48 +0000
+++ click/tests/integration/test_chroot.py	2014-09-09 18:07:23 +0000
@@ -16,22 +16,21 @@
 """Integration tests for the click chroot feature."""
 
 import subprocess
-import unittest
 
 from .helpers import (
-    has_network,
-    is_root,
+    require_network,
+    require_root,
     ClickTestCase,
 )
 
 
[e-mail](not is_root(), "This tests needs to run as root")
[e-mail](not has_network(), "Need network")
 class TestChroot(ClickTestCase):
 
     @classmethod
     def setUpClass(cls):
         super(TestChroot, cls).setUpClass()
+        require_root()
+        require_network()
         cls.arch = subprocess.check_output(
             ["dpkg", "--print-architecture"], universal_newlines=True).strip()
         subprocess.check_call([
@@ -67,3 +66,13 @@
             self.click_binary, "chroot", "-a", self.arch,
             "maint", "id"], universal_newlines=True)
         self.assertEqual(output, "uid=0(root) gid=0(root) groups=0(root)\n")
+
+    def test_exists_ok(self):
+        subprocess.check_call([
+            self.click_binary, "chroot", "-a", self.arch, "exists"])
+
+    def test_exists_no(self):
+        with self.assertRaises(subprocess.CalledProcessError):
+            subprocess.check_call([
+                self.click_binary,
+                "chroot", "-a", "arch-that-does-not-exist"])

=== modified file 'click/tests/integration/test_contents.py'
--- tests/integration/test_contents.py	2014-06-26 12:00:09 +0000
+++ click/tests/integration/test_contents.py	2014-09-09 18:07:23 +0000
@@ -23,7 +23,7 @@
 
 class TestContents(ClickTestCase):
     def test_contents(self):
-        name = "com.ubuntu.contents"
+        name = "com.example.contents"
         path_to_click = self._make_click(name)
         output = subprocess.check_output([
             self.click_binary, "contents", path_to_click],

=== modified file 'click/tests/integration/test_frameworks.py'
--- tests/integration/test_frameworks.py	2014-06-26 12:00:09 +0000
+++ click/tests/integration/test_frameworks.py	2014-09-09 18:07:23 +0000
@@ -17,18 +17,17 @@
 
 import os
 import subprocess
-import unittest
-
-from .helpers import (
-    ClickTestCase,
-)
-
-
[e-mail](
-    (not os.path.exists("/usr/share/click/frameworks") or
-     not os.listdir("/usr/share/click/frameworks")),
-    "Please install ubuntu-sdk-libs")
+
+from .helpers import ClickTestCase
+
+
 class TestFrameworks(ClickTestCase):
+    def setUp(self):
+        super(TestFrameworks, self).setUp()
+        if (not os.path.exists("/usr/share/click/frameworks") or
+                not os.listdir("/usr/share/click/frameworks")):
+            self.skipTest("Please install ubuntu-sdk-libs")
+
     def test_framework_list(self):
         output = subprocess.check_output([
             self.click_binary, "framework", "list"], universal_newlines=True)

=== modified file 'click/tests/integration/test_hook.py'
--- tests/integration/test_hook.py	2014-08-22 17:01:08 +0000
+++ click/tests/integration/test_hook.py	2014-09-09 18:07:23 +0000
@@ -18,16 +18,20 @@
 import os
 import subprocess
 from textwrap import dedent
-import unittest
 
 from .helpers import (
-    is_root,
     ClickTestCase,
+    require_root,
 )
 
 
[e-mail](not is_root(), "This tests needs to run as root")
 class TestHook(ClickTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestHook, cls).setUpClass()
+        require_root()
+
     def _make_hook(self, name):
         hook_fname = "/usr/share/click/hooks/%s.hook" % name
         canary_fname = os.path.join(self.temp_dir, "canary.sh")
@@ -63,14 +67,7 @@
         click_pkg = self._make_click(
             click_pkg_name, framework="", hooks=hooks)
         user = os.environ.get("USER", "root")
-        subprocess.check_call(
-            [self.click_binary, "install", "--allow-unauthenticated",
-             "--user=%s" % user, click_pkg],
-            universal_newlines=True)
-        self.addCleanup(
-            subprocess.check_call,
-            [self.click_binary, "unregister", "--user=%s" % user,
-             click_pkg_name])
+        self.click_install(click_pkg, click_pkg_name, user)
         # ensure we have the hook
         generated_hook_file = os.path.expanduser(
             "~/com.example.hook-1_app1_1.0.test-hook")

=== modified file 'click/tests/integration/test_info.py'
--- tests/integration/test_info.py	2014-08-22 17:01:08 +0000
+++ click/tests/integration/test_info.py	2014-09-09 18:07:23 +0000
@@ -16,19 +16,30 @@
 """Integration tests for the click CLI info command."""
 
 import json
+import os
 import subprocess
 
 from .helpers import ClickTestCase
 
 
 class TestInfo(ClickTestCase):
-    def test_info(self):
-        name = "com.ubuntu.foo"
+    def test_info_from_path(self):
+        name = "com.example.foo"
         path_to_click = self._make_click(name)
         output = subprocess.check_output([
             self.click_binary, "info", path_to_click], universal_newlines=True)
         self.assertEqual(name, json.loads(output)["name"])
 
+
+    def test_info_installed_click(self):
+        name = "com.example.foo"
+        user = os.environ.get("USER", "root")
+        path_to_click = self._make_click(name, framework="")
+        self.click_install(path_to_click, name, user)
+        output = subprocess.check_output([
+            self.click_binary, "info", name], universal_newlines=True)
+        self.assertEqual(json.loads(output)["name"], name)
+
     def test_info_file_in_package(self):
         name = "org.example.info"
         version = "1.0"

=== modified file 'click/tests/integration/test_install.py'
--- tests/integration/test_install.py	2014-08-22 17:01:08 +0000
+++ click/tests/integration/test_install.py	2014-09-09 18:07:23 +0000
@@ -15,11 +15,12 @@
 
 """Integration tests for the click install feature."""
 
-import os
 import subprocess
-import unittest
 
-from .helpers import ClickTestCase
+from .helpers import (
+    require_root,
+    ClickTestCase,
+)
 
 
 def add_user(name):
@@ -31,13 +32,12 @@
     subprocess.check_call(["userdel", "-r", name])
 
 
[e-mail](
-    os.getuid() != 0, "This tests needs to run as root")
 class TestClickInstall(ClickTestCase):
 
     @classmethod
     def setUpClass(cls):
         super(TestClickInstall, cls).setUpClass()
+        require_root()
         cls.USER_1 = add_user("click-test-user-1")
         cls.USER_2 = add_user("click-test-user-2")
 
@@ -47,27 +47,16 @@
         del_user(cls.USER_1)
         del_user(cls.USER_2)
 
-    def click_unregister(self, username, click_name):
-        if username == "@all":
-            user = "--all-users"
-        else:
-            user = "--user=%s" % username
-        subprocess.check_call(
-            [self.click_binary, "unregister", user, click_name])
-
     def test_install_for_single_user(self):
-        click_pkg = self._make_click(name="foo-1", framework="")
+        name = "foo-1"
+        click_pkg = self._make_click(name=name, framework="")
         # install it
-        subprocess.check_call([
-            self.click_binary, "install", "--user=%s" % self.USER_1,
-            "--allow-unauthenticated",
-            click_pkg], universal_newlines=True)
-        self.addCleanup(self.click_unregister, self.USER_1, "foo-1")
+        self.click_install(click_pkg, name, self.USER_1)
         # ensure that user-1 has it
         output = subprocess.check_output([
             "sudo", "-u", self.USER_1,
             self.click_binary, "list"], universal_newlines=True)
-        self.assertEqual(output, "foo-1\t1.0\n")
+        self.assertEqual(output, "%s\t1.0\n" % name)
         # but not user-2
         output = subprocess.check_output([
             "sudo", "-u", self.USER_2,
@@ -77,40 +66,53 @@
         output = subprocess.check_output(
             [self.click_binary, "list", "--user=%s" % self.USER_1],
             universal_newlines=True)
-        self.assertEqual(output, "foo-1\t1.0\n")
+        self.assertEqual(output, "%s\t1.0\n" % name)
+
+    def test_install_for_single_user_and_register(self):
+        name = "foo-1"
+        click_pkg = self._make_click(name=name, framework="")
+        self.click_install(click_pkg, name, self.USER_1)
+        # not available for user2
+        output = subprocess.check_output([
+            "sudo", "-u", self.USER_2,
+            self.click_binary, "list"], universal_newlines=True)
+        self.assertEqual(output, "")
+        # register it
+        subprocess.check_call(
+            [self.click_binary, "register", "--user=%s" % self.USER_2,
+             name, "1.0", ])
+        self.addCleanup(self.click_unregister, name, self.USER_2)
+        # and ensure its available for user2
+        output = subprocess.check_output([
+            "sudo", "-u", self.USER_2,
+            self.click_binary, "list"], universal_newlines=True)
+        self.assertEqual(output, "%s\t1.0\n" % name)
 
     def test_install_for_all_users(self):
-        click_pkg = self._make_click(name="foo-2", framework="")
-        # install it
-        subprocess.check_call(
-            [self.click_binary, "install", "--all-users",
-            "--allow-unauthenticated", click_pkg],
-            universal_newlines=True)
-        self.addCleanup(self.click_unregister, "@all", "foo-2")
+        name = "foo-2"
+        click_pkg = self._make_click(name=name, framework="")
+        self.click_install(click_pkg, name, "@all")
         # ensure all users see it
         for user in (self.USER_1, self.USER_2):
             output = subprocess.check_output(
                 ["sudo", "-u", user, self.click_binary, "list"],
                 universal_newlines=True)
-            self.assertEqual(output, "foo-2\t1.0\n")
+            self.assertEqual(output, "%s\t1.0\n" % name)
 
     def test_pkgdir_after_install(self):
-        click_pkg = self._make_click(name="foo-2", version="1.2", framework="")
-        subprocess.check_call(
-            [self.click_binary, "install", "--all-users",
-            "--allow-unauthenticated", click_pkg],
-            universal_newlines=True)
-        self.addCleanup(self.click_unregister, "@all", "foo-2")
+        name = "foo-3"
+        click_pkg = self._make_click(name=name, version="1.2", framework="")
+        self.click_install(click_pkg, name, "@all")
         # from the path
         output = subprocess.check_output(
             [self.click_binary, "pkgdir",
-             "/opt/click.ubuntu.com/foo-2/1.2/README"],
+             "/opt/click.ubuntu.com/%s/1.2/README" % name],
             universal_newlines=True).strip()
-        self.assertEqual(output, "/opt/click.ubuntu.com/foo-2/1.2")
+        self.assertEqual(output, "/opt/click.ubuntu.com/%s/1.2" % name)
         # now test from the click package name
         output = subprocess.check_output(
-            [self.click_binary, "pkgdir", "foo-2"],
+            [self.click_binary, "pkgdir", name],
             universal_newlines=True).strip()
         # note that this is different from above
         self.assertEqual(
-            output, "/opt/click.ubuntu.com/.click/users/@all/foo-2")
+            output, "/opt/click.ubuntu.com/.click/users/@all/%s" % name)

=== added file 'click/tests/integration/test_list.py'
--- click/tests/integration/test_list.py	1970-01-01 00:00:00 +0000
+++ click/tests/integration/test_list.py	2014-09-09 18:07:23 +0000
@@ -0,0 +1,33 @@
+# Copyright (C) 2014 Canonical Ltd.
+# Author: Michael Vogt <[e-mail]>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; version 3 of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""Integration tests for the click CLI list command."""
+
+import os
+import subprocess
+
+from .helpers import ClickTestCase
+
+
+class TestList(ClickTestCase):
+    def test_list_simple(self):
+        name = "com.ubuntu.verify-ok"
+        path_to_click = self._make_click(name, framework="")
+        user = os.environ.get("USER", "root")
+        self.click_install(path_to_click, name, user)
+        output = subprocess.check_output(
+            [self.click_binary, "list", "--user=%s" % user],
+            universal_newlines=True)
+        self.assertIn(name, output)

=== modified file 'click/tests/integration/test_signatures.py'
--- tests/integration/test_signatures.py	2014-08-22 17:01:08 +0000
+++ click/tests/integration/test_signatures.py	2014-09-09 18:07:23 +0000
@@ -20,20 +20,21 @@
 import shutil
 import subprocess
 import tarfile
-import unittest
 from textwrap import dedent
 
 from .helpers import (
-    is_root,
+    require_root,
     ClickTestCase,
 )
 
+
 def makedirs(path):
     try:
         os.makedirs(path)
     except OSError:
         pass
 
+
 def get_keyid_from_gpghome(gpg_home):
     """Return the public keyid of a given gpg home dir"""
     output = subprocess.check_output(
@@ -56,7 +57,7 @@
     def sign(self, filepath, signature_type="origin"):
         """Sign the click at filepath"""
         env = copy.copy(os.environ)
-        env["GNUPGHOME"] = os.path.abspath(self.gpghome)        
+        env["GNUPGHOME"] = os.path.abspath(self.gpghome)
         subprocess.check_call(
             ["debsigs",
              "--sign=%s" % signature_type,
@@ -74,7 +75,7 @@
         <Selection>
         <Required Type="origin" File="{filename}" id="{keyid}"/>
         </Selection>
-  
+
         <Verification>
         <Required Type="origin" File="{filename}" id="{keyid}"/>
         </Verification>
@@ -86,7 +87,8 @@
         self.pubkey_path = (
             "/usr/share/debsig/keyrings/%s/origin.pub" % self.keyid)
         makedirs(os.path.dirname(self.pubkey_path))
-        shutil.copy(os.path.join(self.gpghome, "pubring.gpg"), self.pubkey_path)
+        shutil.copy(
+            os.path.join(self.gpghome, "pubring.gpg"), self.pubkey_path)
 
     def uninstall_signature_policy(self):
         # FIXME: update debsig-verify so that it can work from a different
@@ -96,8 +98,13 @@
         os.remove(self.pubkey_path)
 
 
[e-mail](not is_root(), "This tests needs to run as root")
 class ClickSignaturesTestCase(ClickTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(ClickSignaturesTestCase, cls).setUpClass()
+        require_root()
+
     def assertClickNoSignatureError(self, cmd_args):
         with self.assertRaises(subprocess.CalledProcessError) as cm:
             output = subprocess.check_output(
@@ -120,8 +127,13 @@
         self.assertIn(expected_error_message, output)
 
 
[e-mail](not is_root(), "This tests needs to run as root")
 class TestSignatureVerificationNoSignature(ClickSignaturesTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestSignatureVerificationNoSignature, cls).setUpClass()
+        require_root()
+
     def test_debsig_verify_no_sig(self):
         name = "org.example.debsig-no-sig"
         path_to_click = self._make_click(name, framework="")
@@ -145,8 +157,13 @@
                               "--user=%s" % user, name])
 
 
[e-mail](not is_root(), "This tests needs to run as root")
 class TestSignatureVerification(ClickSignaturesTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestSignatureVerification, cls).setUpClass()
+        require_root()
+
     def setUp(self):
         super(TestSignatureVerification, self).setUp()
         self.user = os.environ.get("USER", "root")
@@ -176,7 +193,7 @@
             [self.click_binary, "list", "--user=%s" % self.user],
             universal_newlines=True)
         self.assertIn(name, output)
-        
+
     def test_debsig_install_signature_not_in_keyring(self):
         name = "org.example.debsig-no-keyring-sig"
         path_to_click = self._make_click(name, framework="")
@@ -245,7 +262,7 @@
         # NOTE: that right now this will not be caught by debsig-verify
         #        but later in audit() by debian.debfile.DebFile()
         subprocess.check_call(["ar",
-                               "-r", 
+                               "-r",
                                "-b", "data.tar.gz",
                                path_to_click,
                                new_data])
@@ -274,12 +291,12 @@
         new_data = self.make_nasty_data_tar("bz2")
         # replace data.tar.gz with data.tar.bz2 and ensure this is caught
         subprocess.check_call(["ar",
-                               "-d", 
+                               "-d",
                                path_to_click,
                                "data.tar.gz",
                                ])
         subprocess.check_call(["ar",
-                               "-r", 
+                               "-r",
                                path_to_click,
                                new_data])
         output = subprocess.check_output(
@@ -290,7 +307,7 @@
                           "control.tar.gz",
                           "_gpgorigin",
                           "data.tar.bz2",
-                         ])
+                          ])
         with self.assertRaises(subprocess.CalledProcessError) as cm:
             output = subprocess.check_output(
                 [self.click_binary, "install", path_to_click],
@@ -305,7 +322,7 @@
         # this test is probably not really needed, it tries to trick
         # the system by prepending a valid signature that is not
         # in the keyring. But given that debsig-verify only reads
-        # the first packet of any given _gpg$foo signature its 
+        # the first packet of any given _gpg$foo signature it's
         # equivalent to test_debsig_install_signature_not_in_keyring test
         name = "org.example.debsig-replaced-data-prepend-sig-click"
         path_to_click = self._make_click(name, framework="")
@@ -313,7 +330,7 @@
         new_data = self.make_nasty_data_tar("gz")
         # replace data.tar.gz
         subprocess.check_call(["ar",
-                               "-r", 
+                               "-r",
                                path_to_click,
                                new_data,
                                ])
@@ -345,4 +362,3 @@
             [self.click_binary, "list", "--user=%s" % self.user],
             universal_newlines=True)
         self.assertNotIn(name, output)
-        

=== modified file 'click/tests/integration/test_verify.py'
--- tests/integration/test_verify.py	2014-08-07 21:51:27 +0000
+++ click/tests/integration/test_verify.py	2014-09-09 18:07:23 +0000
@@ -15,14 +15,15 @@
 
 """Integration tests for the click CLI verify command."""
 
+import os
 import subprocess
 
 from .helpers import ClickTestCase
 
 
 class TestVerify(ClickTestCase):
-    def test_verify_ok(self):
-        name = "com.example.verify-ok"
+    def test_verify_force_missing_framework_ok(self):
+        name = "com.example.verify-missing-framework"
         path_to_click = self._make_click(name)
         output = subprocess.check_output([
             self.click_binary, "verify",
@@ -30,3 +31,42 @@
             "--allow-unauthenticated",
             path_to_click], universal_newlines=True)
         self.assertEqual(output, "")
+
+    def test_verify_force_ok(self):
+        name = "com.example.verify-ok"
+        path_to_click = self._make_click(name, framework="")
+        output = subprocess.check_output([
+            self.click_binary, "verify", "--allow-unauthenticated",
+            path_to_click], universal_newlines=True)
+        self.assertEqual(output, "")
+
+    def test_verify_missing_framework(self):
+        name = "com.example.verify-really-missing-framework"
+        path_to_click = self._make_click(name, framework="missing")
+        with self.assertRaises(subprocess.CalledProcessError) as cm:
+            subprocess.check_output(
+                [self.click_binary, "verify",
+                 "--allow-unauthenticated",
+                 path_to_click],
+                universal_newlines=True, stderr=subprocess.STDOUT)
+        expected_error = (
+            'click.framework.ClickFrameworkInvalid: Framework '
+            '"missing" not present on system (use '
+            '--force-missing-framework option to override)')
+        self.assertIn(expected_error, cm.exception.output)
+
+    def test_verify_no_click_but_invalid(self):
+        name = "com.example.verify-no-click"
+        path_to_click = os.path.join(self.temp_dir, name+".click")
+        with open(path_to_click, "w") as f:
+            f.write("something-that-is-not-a-click")
+        with self.assertRaises(subprocess.CalledProcessError) as cm:
+            subprocess.check_output(
+                [self.click_binary, "verify", "--allow-unauthenticated",
+                 path_to_click],
+                universal_newlines=True, stderr=subprocess.STDOUT)
+        expected_error = (
+            'click.install.DebsigVerifyError: Signature verification error: '
+            'debsig: %s does not appear to be a deb format package'
+        ) % path_to_click
+        self.assertIn(expected_error, cm.exception.output)

=== modified file 'click/tests/test_build.py'
--- click/tests/test_build.py	2014-05-13 18:56:57 +0000
+++ click/tests/test_build.py	2014-09-09 18:07:23 +0000
@@ -63,14 +63,14 @@
         with mkfile(manifest_path) as manifest:
             print(dedent("""\
                 {
-                    "name": "com.ubuntu.test",
+                    "name": "com.example.test",
                     "version": "1.0",
                     "maintainer": "Foo Bar <[e-mail]>",
                     "title": "test title",
                     "framework": "ubuntu-sdk-13.10"
                 }"""), file=manifest)
         self.builder.read_manifest(manifest_path)
-        self.assertEqual("com.ubuntu.test", self.builder.name)
+        self.assertEqual("com.example.test", self.builder.name)
         self.assertEqual("1.0", self.builder.version)
         self.assertEqual("Foo Bar <[e-mail]>", self.builder.maintainer)
         self.assertEqual("test title", self.builder.title)
@@ -90,7 +90,7 @@
             with mkfile(manifest_path) as manifest:
                 print(dedent("""\
                     {
-                        "name": "com.ubuntu.test",
+                        "name": "com.example.test",
                         "version": "%s",
                         "maintainer": "Foo Bar <[e-mail]>",
                         "title": "test title",
@@ -106,7 +106,7 @@
             # The comma after the "name" entry is intentionally missing.
             print(dedent("""\
                 {
-                    "name": "com.ubuntu.test"
+                    "name": "com.example.test"
                     "version": "1.0"
                 }"""), file=manifest)
         self.assertRaises(
@@ -136,7 +136,7 @@
             f.write("test /toplevel\n")
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
-                "name": "com.ubuntu.test",
+                "name": "com.example.test",
                 "version": "1.0",
                 "maintainer": "Foo Bar <[e-mail]>",
                 "title": "test title",
@@ -146,11 +146,11 @@
             # build() overrides this back to 0o644
             os.fchmod(f.fileno(), 0o600)
         self.builder.add_file(scratch, "/")
-        path = os.path.join(self.temp_dir, "com.ubuntu.test_1.0_all.click")
+        path = os.path.join(self.temp_dir, "com.example.test_1.0_all.click")
         self.assertEqual(path, self.builder.build(self.temp_dir))
         self.assertTrue(os.path.exists(path))
         for key, value in (
-            ("Package", "com.ubuntu.test"),
+            ("Package", "com.example.test"),
             ("Version", "1.0"),
             ("Click-Version", "0.4"),
             ("Architecture", "all"),
@@ -212,7 +212,7 @@
         touch(os.path.join(scratch, ".click", "evil-file"))
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
-                "name": "com.ubuntu.test",
+                "name": "com.example.test",
                 "version": "1.0",
                 "maintainer": "Foo Bar <[e-mail]>",
                 "title": "test title",
@@ -231,7 +231,7 @@
         scratch = os.path.join(self.temp_dir, "scratch")
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
-                "name": "com.ubuntu.test",
+                "name": "com.example.test",
                 "version": "1.0",
                 "maintainer": "Foo Bar <[e-mail]>",
                 "title": "test title",
@@ -239,7 +239,7 @@
                 "framework": "ubuntu-sdk-13.10",
             }, f)
         self.builder.add_file(scratch, "/")
-        path = os.path.join(self.temp_dir, "com.ubuntu.test_1.0_multi.click")
+        path = os.path.join(self.temp_dir, "com.example.test_1.0_multi.click")
         self.assertEqual(path, self.builder.build(self.temp_dir))
         self.assertTrue(os.path.exists(path))
         self.assertEqual("multi", self.extract_field(path, "Architecture"))
@@ -260,7 +260,7 @@
         scratch = os.path.join(self.temp_dir, "scratch")
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
-                "name": "com.ubuntu.test",
+                "name": "com.example.test",
                 "version": "1.0",
                 "maintainer": "Foo Bar <[e-mail]>",
                 "title": "test title",
@@ -322,7 +322,7 @@
         touch(os.path.join(scratch, ".git", "config"))
         with mkfile(os.path.join(scratch, "manifest.json")) as f:
             json.dump({
-                "name": "com.ubuntu.test",
+                "name": "com.example.test",
                 "version": "1.0",
                 "maintainer": "Foo Bar <[e-mail]>",
                 "title": "test title",
@@ -332,7 +332,7 @@
             # build() overrides this back to 0o644
             os.fchmod(f.fileno(), 0o600)
         self.builder.add_file(scratch, "./")
-        path = os.path.join(self.temp_dir, "com.ubuntu.test_1.0.tar.gz")
+        path = os.path.join(self.temp_dir, "com.example.test_1.0.tar.gz")
         self.assertEqual(path, self.builder.build(self.temp_dir))
         self.assertTrue(os.path.exists(path))
         with tarfile.open(path, mode="r:gz") as tar:

=== modified file 'debian/changelog'
--- debian/changelog	2014-08-22 17:19:06 +0000
+++ debian/changelog	2014-09-09 18:07:23 +0000
@@ -1,3 +1,46 @@
+click (0.4.32.1) UNRELEASED; urgency=low
+
+  * fix autopkgtest failure found in 0.4.32
+
+ -- Michael Vogt <[e-mail]>  Tue, 09 Sep 2014 09:56:57 +0200
+
+click (0.4.32) utopic; urgency=medium
+
+  [ Daniel Holbach ]
+  * Run click-review after a successful build of a click package. Offer
+    --no-validate as an option.
+
+  [ Colin Watson ]
+  * Move integration tests to a location where they won't end up being
+    installed into inappropriate places on the system module path
+    (LP: #1337696).
+  * Use six.with_metaclass for TestBuildCoreApps, so that it doesn't make
+    pyflakes angry when running tests under Python 2.
+
+  [ Michael Vogt ]
+  * Add more integration tests for "click {list,register,verify,info}".
+  * Only install trusted click packages by default. To override you
+    can run "pkcon --allow-untrusted" (LP: #1360582)
+
+ -- Ubuntu daily release <[e-mail]>  Mon, 08 Sep 2014 09:50:43 +0000
+
+click (0.4.31.3) utopic; urgency=medium
+
+  * Reinstate most of 0.4.31.2; instead, just always pass
+    --allow-unauthenticated to "click install" from the PackageKit plugin
+    for now, until we can sort out sideloading (see LP #1360582).
+
+ -- Colin Watson <[e-mail]>  Mon, 25 Aug 2014 12:25:21 -0700
+
+click (0.4.31.2.is.0.4.30) utopic; urgency=medium
+
+  * Temporary everting to previous version as the current one makes installing
+    click packages locally through pkcon install-local impossible, which is
+    breaking some other projects relying on this functionality. Needs to be
+    revisited.
+
+ -- Łukasz 'sil2100' Zemczak <[e-mail]>  Mon, 25 Aug 2014 17:34:07 +0200
+
 click (0.4.31.2) utopic; urgency=medium
 
   [ Michael Vogt ]

=== modified file 'debian/control'
--- debian/control	2014-06-10 17:18:00 +0000
+++ debian/control	2014-09-09 18:07:23 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Colin Watson <[e-mail]>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage
+Build-Depends: debhelper (>= 9~), dh-autoreconf, intltool, python3:any (>= 3.2), python3-all:any, python3-setuptools, python3-apt, python3-debian, python3-gi, python3:any (>= 3.3) | python3-mock, pep8, python3-pep8, pyflakes, python3-sphinx, pkg-config, valac, gobject-introspection (>= 0.6.7), libgirepository1.0-dev (>= 0.6.7), libglib2.0-dev (>= 2.34), gir1.2-glib-2.0, libjson-glib-dev (>= 0.10), libgee-0.8-dev, libpackagekit-glib2-dev (>= 0.7.2), python3-coverage, python3-six
 Vcs-Bzr: https://code.launchpad.net/~ubuntu-managed-branches/click/click
 Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-managed-branches/click/click/files
 X-Auto-Uploader: no-rewrite-version
@@ -16,6 +16,7 @@
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, python3-click (= ${binary:Version}), adduser
 Recommends: click-apparmor, ubuntu-app-launch-tools | upstart-app-launch-tools
+Suggests: click-reviewers-tools (>= 0.9)
 Conflicts: click-package
 Replaces: click-package
 Provides: click-package

=== modified file 'debian/tests/control'
--- debian/tests/control	2014-07-14 09:10:39 +0000
+++ debian/tests/control	2014-09-09 18:07:23 +0000
@@ -1,3 +1,3 @@
 Tests: run-tests.sh
-Depends: @, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr, debsigs, debsig-verify
+Depends: @, @builddeps@, iputils-ping, click-dev, schroot, debootstrap, sudo, bzr, debsigs, debsig-verify, python3-six
 Restrictions: needs-root allow-stderr

=== modified file 'debian/tests/run-tests.sh'
--- debian/tests/run-tests.sh	2014-06-11 12:40:44 +0000
+++ debian/tests/run-tests.sh	2014-09-09 18:07:23 +0000
@@ -2,4 +2,11 @@
 
 set -e
 
-python3 -m unittest discover tests.integration
+# some files like config.py are generated from config.py.in
+./autogen.sh
+./configure --prefix=/usr \
+        --sysconfdir=/etc \
+        --with-systemdsystemunitdir=/lib/systemd/system \
+        --with-systemduserunitdir=/usr/lib/systemd/user
+
+TEST_INTEGRATION=1 python3 -m unittest discover -vv click.tests.integration

=== modified file 'doc/manpage.rst'
--- doc/manpage.rst	2014-05-20 09:04:03 +0000
+++ doc/manpage.rst	2014-09-09 18:07:23 +0000
@@ -73,6 +73,8 @@
 
 -m PATH, --manifest=PATH    Read package manifest from PATH
                             (default: ``manifest.json``).
+--no-validate               Don't run checks from click-reviewers-tools on
+                            the resulting .click file.
 
 click buildsource DIRECTORY
 ---------------------------

=== modified file 'pk-plugin/pk-plugin-click.c'
--- pk-plugin/pk-plugin-click.c	2014-08-19 07:06:25 +0000
+++ pk-plugin/pk-plugin-click.c	2014-09-09 18:07:23 +0000
@@ -515,10 +515,14 @@
 	JsonObject *manifest;
 	gchar *pkid = NULL;
 
-	argv = g_malloc0_n (6, sizeof (*argv));
+	argv = g_malloc0_n (7, sizeof (*argv));
 	i = 0;
 	argv[i++] = g_strdup ("click");
 	argv[i++] = g_strdup ("install");
+	if (!pk_bitfield_contain (pk_transaction_get_transaction_flags (transaction),
+				  PK_TRANSACTION_FLAG_ENUM_ONLY_TRUSTED)) {
+		argv[i++] = g_strdup ("--allow-unauthenticated");
+	}
 	username = click_get_username_for_uid
 		(pk_transaction_get_uid (transaction));
 	if (username)

=== removed directory 'tests'
=== removed file 'tests/__init__.py'