Merge lp:click/devel into lp:click

[Colin Watson]

Click 0.4.30: Unit test improvements; fix upgrade if packages are present for removed users; flesh out 14.10 chroots.

  [ Colin Watson ]
  * Add many more unit tests to fill in some gaps in the coverage report.

  [ Michael Vogt ]
  * Exclude non-existing users from User.get_user_names()
    (LP: #1334611)

  [ Zoltan Balogh ]
  * Add a set of APIs to the 14.10 frameworks. Add ubuntu-ui-toolkit-doc to
    all frameworks.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file '.bzrignore'
--- .bzrignore	2014-06-30 16:48:31 +0000
+++ .bzrignore	2014-08-06 23:22:03 +0000
@@ -33,6 +33,7 @@
 click/paths.py
 click/tests/config.py
 click/tests/preload.gir
+click/tests/test_paths.py
 build-aux/compile
 build-aux/config.guess
 build-aux/config.rpath

=== modified file 'click/chroot.py'
--- click/chroot.py	2014-07-03 11:03:24 +0000
+++ click/chroot.py	2014-08-06 23:22:03 +0000
@@ -73,6 +73,7 @@
         "qtscript5-dev:TARGET",
         "qtsensors5-dev:TARGET",
         "qttools5-dev:TARGET",
+        "ubuntu-ui-toolkit-doc",
         ],
     "ubuntu-sdk-14.04": [
         "cmake",
@@ -94,27 +95,53 @@
         "qtsensors5-dev:TARGET",
         "qttools5-dev:TARGET",
         "qttools5-dev-tools:TARGET",
+        "ubuntu-ui-toolkit-doc",
         ],
     "ubuntu-sdk-14.10": [
         "cmake",
-        "libqt5svg5-dev:TARGET",
-        "libqt5webkit5-dev:TARGET",
-        "libqt5xmlpatterns5-dev:TARGET",
-        "libunity-scopes-dev:TARGET",
-        # bug #1316930, needed for autopilot
-        "python3",
-        "qmlscene:TARGET",
-        "qt3d5-dev:TARGET",
-        "qt5-default:TARGET",
-        "qtbase5-dev:TARGET",
-        "qtdeclarative5-dev:TARGET",
-        "qtdeclarative5-dev-tools",
-        "qtlocation5-dev:TARGET",
-        "qtmultimedia5-dev:TARGET",
-        "qtscript5-dev:TARGET",
+        "libcontent-hub-dev:TARGET",
+        "libqt5keychain0:TARGET",
         "libqt5sensors5-dev:TARGET",
+        "libqt5svg5-dev:TARGET",
+        "libqt5webkit5-dev:TARGET",
+        "libqt5xmlpatterns5-dev:TARGET",
+        "libunity-scopes-dev:TARGET",
+        # bug #1316930, needed for autopilot
+        "python3",
+        "qml-module-qt-labs-settings:TARGET",
+        "qml-module-qtmultimedia:TARGET",
+        "qml-module-qtquick-layouts:TARGET",
+        "qml-module-qtsensors:TARGET",
+        "qml-module-qtwebkit:TARGET",
+        "qmlscene:TARGET",
+        "qt3d5-dev:TARGET",
+        "qt5-default:TARGET",
+        "qtdeclarative5-accounts-plugin:TARGET",
+        "qtdeclarative5-dev-tools",
+        "qtdeclarative5-folderlistmodel-plugin:TARGET",
+        "qtdeclarative5-localstorage-plugin:TARGET",
+        "qtdeclarative5-online-accounts-client0.1:TARGET",
+        "qtdeclarative5-particles-plugin:TARGET",
+        "qtdeclarative5-poppler1.0:TARGET",
+        "qtdeclarative5-qtlocation-plugin:TARGET",
+        "qtdeclarative5-qtorganizer-plugin:TARGET",
+        "qtdeclarative5-qtpositioning-plugin:TARGET",
+        "qtdeclarative5-u1db1.0:TARGET",
+        "qtdeclarative5-ubuntu-content0.1:TARGET",
+        "qtdeclarative5-ubuntu-download-manager0.1:TARGET",
+        "qtdeclarative5-ubuntu-mediascanner0.1:TARGET",
+        "qtdeclarative5-ubuntu-syncmonitor0.1:TARGET",
+        "qtdeclarative5-ubuntu-telephony-phonenumber0.1:TARGET",
+        "qtdeclarative5-ubuntu-ui-toolkit-plugin:TARGET",
+        "qtdeclarative5-usermetrics0.1:TARGET",
+        "qtdeclarative5-xmllistmodel-plugin:TARGET",
+        "qtlocation5-dev:TARGET",
+        "qtmultimedia5-dev:TARGET",
+        "qtscript5-dev:TARGET",
         "qttools5-dev:TARGET",
         "qttools5-dev-tools:TARGET",
+        "ubuntu-html5-theme:TARGET",
+        "ubuntu-ui-toolkit-doc",
         ],
     }
 

=== modified file 'click/tests/Makefile.am'
--- click/tests/Makefile.am	2014-03-10 09:30:31 +0000
+++ click/tests/Makefile.am	2014-08-06 23:22:03 +0000
@@ -9,3 +9,13 @@
 		-I$(top_builddir)/lib/click -L$(top_builddir)/lib/click \
 		--accept-unprefixed --warn-all \
 		$< --output $@
+
+noinst_SCRIPTS = test_paths.py
+CLEANFILES += $(noinst_SCRIPTS)
+
+do_subst = sed \
+	-e 's,[@]sysconfdir[@],$(sysconfdir),g' \
+	-e 's,[@]pkgdatadir[@],$(pkgdatadir),g'
+
+test_paths.py: test_paths.py.in Makefile
+	$(do_subst) < $(srcdir)/test_paths.py.in > $@

=== modified file 'click/tests/test_database.py'
--- click/tests/test_database.py	2014-06-01 12:45:10 +0000
+++ click/tests/test_database.py	2014-08-06 23:22:03 +0000
@@ -20,6 +20,7 @@
 __metaclass__ = type
 __all__ = [
     "TestClickDB",
+    "TestClickInstalledPackage",
     "TestClickSingleDB",
     ]
 
@@ -28,14 +29,50 @@
 from itertools import takewhile
 import json
 import os
+import unittest
 
-from gi.repository import Click
+from gi.repository import Click, GLib
 
 from click.json_helpers import json_array_to_python, json_object_to_python
 from click.tests.gimock_types import Passwd
 from click.tests.helpers import TestCase, mkfile, touch
 
 
+class TestClickInstalledPackage(TestCase):
+    def setUp(self):
+        super(TestClickInstalledPackage, self).setUp()
+        self.foo = Click.InstalledPackage.new(
+            "foo", "1.0", "/path/to/foo/1.0", False)
+        self.foo_clone = Click.InstalledPackage.new(
+            "foo", "1.0", "/path/to/foo/1.0", False)
+        self.foo_different_version = Click.InstalledPackage.new(
+            "foo", "2.0", "/path/to/foo/1.0", False)
+        self.foo_different_path = Click.InstalledPackage.new(
+            "foo", "1.0", "/path/to/foo/2.0", False)
+        self.foo_different_writeable = Click.InstalledPackage.new(
+            "foo", "1.0", "/path/to/foo/1.0", True)
+        self.bar = Click.InstalledPackage.new(
+            "bar", "1.0", "/path/to/foo/1.0", False)
+
+    def test_hash(self):
+        self.assertIsInstance(self.foo.hash(), int)
+        self.assertEqual(self.foo.hash(), self.foo_clone.hash())
+        self.assertNotEqual(self.foo.hash(), self.foo_different_version.hash())
+        self.assertNotEqual(self.foo.hash(), self.foo_different_path.hash())
+        self.assertNotEqual(
+            self.foo.hash(), self.foo_different_writeable.hash())
+        self.assertNotEqual(self.foo.hash(), self.bar.hash())
+
+    # GLib doesn't allow passing an InstalledPackage as an argument here.
+    @unittest.expectedFailure
+    def test_equal_to(self):
+        self.assertTrue(self.foo.equal_to(self.foo_clone))
+        self.assertFalse(self.foo.equal_to(self.foo_different_version))
+        self.assertFalse(self.foo.equal_to(self.foo_different_path))
+        self.assertFalse(self.foo.equal_to(self.foo_different_writeable))
+        self.assertFalse(self.foo.equal_to(self.bar))
+
+
 class TestClickSingleDB(TestCase):
     def setUp(self):
         super(TestClickSingleDB, self).setUp()
@@ -66,6 +103,11 @@
         self.assertRaisesDatabaseError(
             Click.DatabaseError.DOES_NOT_EXIST, self.db.get_path, "a", "1.1")
 
+    def test_has_package_version(self):
+        os.makedirs(os.path.join(self.temp_dir, "a", "1.0"))
+        self.assertTrue(self.db.has_package_version("a", "1.0"))
+        self.assertFalse(self.db.has_package_version("a", "1.1"))
+
     def test_packages_current(self):
         os.makedirs(os.path.join(self.temp_dir, "a", "1.0"))
         os.makedirs(os.path.join(self.temp_dir, "a", "1.1"))
@@ -107,9 +149,13 @@
     def test_manifest(self):
         manifest_path = os.path.join(
             self.temp_dir, "a", "1.0", ".click", "info", "a.manifest")
-        manifest_obj = {"name": "a", "version": "1.0", "hooks": {"a-app": {}}}
+        manifest_obj = {
+            "name": "a", "version": "1.0", "hooks": {"a-app": {}},
+            "_should_be_removed": "",
+        }
         with mkfile(manifest_path) as manifest:
             json.dump(manifest_obj, manifest)
+        del manifest_obj["_should_be_removed"]
         manifest_obj["_directory"] = os.path.join(self.temp_dir, "a", "1.0")
         self.assertEqual(
             manifest_obj,
@@ -124,6 +170,26 @@
             Click.DatabaseError.DOES_NOT_EXIST,
             self.db.get_manifest_as_string, "a", "1.1")
 
+    def test_manifest_bad(self):
+        manifest_path = os.path.join(
+            self.temp_dir, "a", "1.0", ".click", "info", "a.manifest")
+        with mkfile(manifest_path) as manifest:
+            print("{bad syntax", file=manifest)
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST, self.db.get_manifest, "a", "1.0")
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST,
+            self.db.get_manifest_as_string, "a", "1.0")
+        manifest_path = os.path.join(
+            self.temp_dir, "a", "1.1", ".click", "info", "a.manifest")
+        with mkfile(manifest_path) as manifest:
+            print("[0]", file=manifest)
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST, self.db.get_manifest, "a", "1.1")
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST,
+            self.db.get_manifest_as_string, "a", "1.1")
+
     def test_app_running(self):
         with self.run_in_subprocess(
                 "click_find_on_path", "g_spawn_sync",
@@ -193,6 +259,43 @@
                 self.g_spawn_sync_side_effect, {b"ubuntu-app-pid": 0})
             self.assertFalse(self.db.any_app_running("a", "1.0"))
 
+    def test_any_app_running_missing_app(self):
+        with self.run_in_subprocess("click_find_on_path") as (enter, preloads):
+            enter()
+            preloads["click_find_on_path"].side_effect = (
+                lambda command: command == b"ubuntu-app-pid")
+            self.assertRaisesDatabaseError(
+                Click.DatabaseError.DOES_NOT_EXIST,
+                self.db.any_app_running, "a", "1.0")
+
+    def test_any_app_running_bad_manifest(self):
+        with self.run_in_subprocess(
+                "click_find_on_path", "g_spawn_sync",
+                ) as (enter, preloads):
+            enter()
+            manifest_path = os.path.join(
+                self.temp_dir, "a", "1.0", ".click", "info", "a.manifest")
+            with mkfile(manifest_path) as manifest:
+                print("{bad syntax", file=manifest)
+            preloads["click_find_on_path"].side_effect = (
+                lambda command: command == b"ubuntu-app-pid")
+            self.assertFalse(self.db.any_app_running("a", "1.0"))
+            self.assertFalse(preloads["g_spawn_sync"].called)
+
+    def test_any_app_running_no_hooks(self):
+        with self.run_in_subprocess(
+                "click_find_on_path", "g_spawn_sync",
+                ) as (enter, preloads):
+            enter()
+            manifest_path = os.path.join(
+                self.temp_dir, "a", "1.0", ".click", "info", "a.manifest")
+            with mkfile(manifest_path) as manifest:
+                json.dump({}, manifest)
+            preloads["click_find_on_path"].side_effect = (
+                lambda command: command == b"ubuntu-app-pid")
+            self.assertFalse(self.db.any_app_running("a", "1.0"))
+            self.assertFalse(preloads["g_spawn_sync"].called)
+
     def test_maybe_remove_registered(self):
         with self.run_in_subprocess(
                 "click_find_on_path", "g_spawn_sync",
@@ -262,9 +365,11 @@
 
     def test_gc(self):
         with self.run_in_subprocess(
-                "click_find_on_path", "g_spawn_sync",
+                "click_find_on_path", "g_spawn_sync", "getpwnam"
                 ) as (enter, preloads):
             enter()
+            preloads["getpwnam"].side_effect = (
+                lambda name: self.make_pointer(Passwd(pw_uid=1, pw_gid=1)))
             os.environ["TEST_QUIET"] = "1"
             a_path = os.path.join(self.temp_dir, "a", "1.0")
             a_manifest_path = os.path.join(
@@ -298,18 +403,24 @@
             self.assertTrue(os.path.exists(c_path))
 
     def test_gc_ignores_non_directory(self):
-        a_path = os.path.join(self.temp_dir, "a", "1.0")
-        a_manifest_path = os.path.join(
-            a_path, ".click", "info", "a.manifest")
-        with mkfile(a_manifest_path) as manifest:
-            json.dump({"hooks": {"a-app": {}}}, manifest)
-        a_user_path = os.path.join(
-            self.temp_dir, ".click", "users", "test-user", "a")
-        os.makedirs(os.path.dirname(a_user_path))
-        os.symlink(a_path, a_user_path)
-        touch(os.path.join(self.temp_dir, "file"))
-        self.db.gc()
-        self.assertTrue(os.path.exists(a_path))
+        with self.run_in_subprocess(
+                "getpwnam"
+                ) as (enter, preloads):
+            enter()
+            preloads["getpwnam"].side_effect = (
+                lambda name: self.make_pointer(Passwd(pw_uid=1, pw_gid=1)))
+            a_path = os.path.join(self.temp_dir, "a", "1.0")
+            a_manifest_path = os.path.join(
+                a_path, ".click", "info", "a.manifest")
+            with mkfile(a_manifest_path) as manifest:
+                json.dump({"hooks": {"a-app": {}}}, manifest)
+            a_user_path = os.path.join(
+                self.temp_dir, ".click", "users", "test-user", "a")
+            os.makedirs(os.path.dirname(a_user_path))
+            os.symlink(a_path, a_user_path)
+            touch(os.path.join(self.temp_dir, "file"))
+            self.db.gc()
+            self.assertTrue(os.path.exists(a_path))
 
     def _make_ownership_test(self):
         path = os.path.join(self.temp_dir, "a", "1.0")
@@ -396,6 +507,38 @@
                 [(1, 1)],
                 set(args[0][1:] for args in preloads["chown"].call_args_list))
 
+    def test_ensure_ownership_missing_clickpkg_user(self):
+        with self.run_in_subprocess("getpwnam") as (enter, preloads):
+            enter()
+            preloads["getpwnam"].return_value = None
+            self.assertRaisesDatabaseError(
+                Click.DatabaseError.ENSURE_OWNERSHIP, self.db.ensure_ownership)
+
+    def test_ensure_ownership_failed_chown(self):
+        def stat_side_effect(name, limit, ver, path, buf):
+            st = self.convert_stat_pointer(name, buf)
+            if path == limit:
+                st.st_uid = 2
+                st.st_gid = 2
+                return 0
+            else:
+                self.delegate_to_original(name)
+                return -1
+
+        with self.run_in_subprocess(
+                "chown", "getpwnam", "__xstat", "__xstat64",
+                ) as (enter, preloads):
+            enter()
+            preloads["chown"].return_value = -1
+            preloads["getpwnam"].side_effect = (
+                lambda name: self.make_pointer(Passwd(pw_uid=1, pw_gid=1)))
+            self._set_stat_side_effect(
+                preloads, stat_side_effect, self.db.props.root)
+
+            self._make_ownership_test()
+            self.assertRaisesDatabaseError(
+                Click.DatabaseError.ENSURE_OWNERSHIP, self.db.ensure_ownership)
+
 
 class TestClickDB(TestCase):
     def setUp(self):
@@ -429,6 +572,17 @@
         db = Click.DB()
         self.assertEqual(0, db.props.size)
 
+    def test_read_nonexistent(self):
+        db = Click.DB()
+        db.read(db_dir=os.path.join(self.temp_dir, "nonexistent"))
+        self.assertEqual(0, db.props.size)
+
+    def test_read_not_directory(self):
+        path = os.path.join(self.temp_dir, "file")
+        touch(path)
+        db = Click.DB()
+        self.assertRaisesFileError(GLib.FileError.NOTDIR, db.read, db_dir=path)
+
     def test_add(self):
         db = Click.DB()
         self.assertEqual(0, db.props.size)
@@ -474,6 +628,24 @@
             os.path.join(self.temp_dir, "b", "pkg", "1.1"),
             db.get_path("pkg", "1.1"))
 
+    def test_has_package_version(self):
+        with open(os.path.join(self.temp_dir, "a.conf"), "w") as a:
+            print("[Click Database]", file=a)
+            print("root = %s" % os.path.join(self.temp_dir, "a"), file=a)
+        with open(os.path.join(self.temp_dir, "b.conf"), "w") as b:
+            print("[Click Database]", file=b)
+            print("root = %s" % os.path.join(self.temp_dir, "b"), file=b)
+        db = Click.DB()
+        db.read(db_dir=self.temp_dir)
+        self.assertFalse(db.has_package_version("pkg", "1.0"))
+        os.makedirs(os.path.join(self.temp_dir, "a", "pkg", "1.0"))
+        self.assertTrue(db.has_package_version("pkg", "1.0"))
+        self.assertFalse(db.has_package_version("pkg", "1.1"))
+        os.makedirs(os.path.join(self.temp_dir, "b", "pkg", "1.0"))
+        self.assertTrue(db.has_package_version("pkg", "1.0"))
+        os.makedirs(os.path.join(self.temp_dir, "b", "pkg", "1.1"))
+        self.assertTrue(db.has_package_version("pkg", "1.1"))
+
     def test_packages_current(self):
         with open(os.path.join(self.temp_dir, "a.conf"), "w") as a:
             print("[Click Database]", file=a)
@@ -570,6 +742,31 @@
             b_manifest_obj,
             json.loads(db.get_manifest_as_string("pkg", "1.1")))
 
+    def test_manifest_bad(self):
+        with open(os.path.join(self.temp_dir, "a.conf"), "w") as a:
+            print("[Click Database]", file=a)
+            print("root = %s" % os.path.join(self.temp_dir, "a"), file=a)
+        db = Click.DB()
+        db.read(db_dir=self.temp_dir)
+        manifest_path = os.path.join(
+            self.temp_dir, "a", "pkg", "1.0", ".click", "info", "pkg.manifest")
+        with mkfile(manifest_path) as manifest:
+            print("{bad syntax", file=manifest)
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST, db.get_manifest, "pkg", "1.0")
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST,
+            db.get_manifest_as_string, "pkg", "1.0")
+        manifest_path = os.path.join(
+            self.temp_dir, "a", "pkg", "1.1", ".click", "info", "pkg.manifest")
+        with mkfile(manifest_path) as manifest:
+            print("[0]", file=manifest)
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST, db.get_manifest, "pkg", "1.0")
+        self.assertRaisesDatabaseError(
+            Click.DatabaseError.BAD_MANIFEST,
+            db.get_manifest_as_string, "pkg", "1.0")
+
     def test_manifests_current(self):
         with open(os.path.join(self.temp_dir, "a.conf"), "w") as a:
             print("[Click Database]", file=a)

=== modified file 'click/tests/test_framework.py'
--- click/tests/test_framework.py	2014-06-23 21:14:06 +0000
+++ click/tests/test_framework.py	2014-08-06 23:22:03 +0000
@@ -27,7 +27,7 @@
 
 from gi.repository import Click
 
-from click.tests.helpers import TestCase
+from click.tests.helpers import TestCase, touch
 
 
 class TestClickFramework(TestCase):
@@ -78,6 +78,48 @@
                 ["ubuntu-sdk-13.10", "ubuntu-sdk-14.04", "ubuntu-sdk-14.10"],
                 sorted(f.props.name for f in Click.Framework.get_frameworks()))
 
+    def test_get_frameworks_nonexistent(self):
+        with self.run_in_subprocess(
+                "click_get_frameworks_dir") as (enter, preloads):
+            enter()
+            frameworks_dir = os.path.join(self.temp_dir, "nonexistent")
+            preloads["click_get_frameworks_dir"].side_effect = (
+                lambda: self.make_string(frameworks_dir))
+            self.assertEqual([], Click.Framework.get_frameworks())
+
+    def test_get_frameworks_not_directory(self):
+        with self.run_in_subprocess(
+                "click_get_frameworks_dir") as (enter, preloads):
+            enter()
+            path = os.path.join(self.temp_dir, "file")
+            touch(path)
+            preloads["click_get_frameworks_dir"].side_effect = (
+                lambda: self.make_string(path))
+            self.assertEqual([], Click.Framework.get_frameworks())
+
+    def test_get_frameworks_ignores_other_files(self):
+        with self.run_in_subprocess(
+                "click_get_frameworks_dir") as (enter, preloads):
+            enter()
+            frameworks_dir = os.path.join(self.temp_dir, "frameworks")
+            Click.ensuredir(frameworks_dir)
+            touch(os.path.join(frameworks_dir, "file"))
+            preloads["click_get_frameworks_dir"].side_effect = (
+                lambda: self.make_string(frameworks_dir))
+            self.assertEqual([], Click.Framework.get_frameworks())
+
+    def test_get_frameworks_ignores_unopenable_files(self):
+        with self.run_in_subprocess(
+                "click_get_frameworks_dir") as (enter, preloads):
+            enter()
+            frameworks_dir = os.path.join(self.temp_dir, "frameworks")
+            Click.ensuredir(frameworks_dir)
+            os.symlink(
+                "nonexistent", os.path.join(frameworks_dir, "foo.framework"))
+            preloads["click_get_frameworks_dir"].side_effect = (
+                lambda: self.make_string(frameworks_dir))
+            self.assertEqual([], Click.Framework.get_frameworks())
+
     def test_fields(self):
         with self.run_in_subprocess(
                 "click_get_frameworks_dir") as (enter, preloads):

=== modified file 'click/tests/test_hooks.py'
--- click/tests/test_hooks.py	2014-06-23 21:14:06 +0000
+++ click/tests/test_hooks.py	2014-08-06 23:22:03 +0000
@@ -164,8 +164,19 @@
             self.assertEqual(
                 "/usr/share/test/${id}.test", hook.get_field("pattern"))
             self.assertEqual("test-update", hook.get_field("exec"))
+            self.assertRaisesHooksError(
+                Click.HooksError.MISSING_FIELD, hook.get_field, "nonexistent")
             self.assertFalse(hook.props.is_user_level)
 
+    def test_open_unopenable_file(self):
+        with self.run_in_subprocess(
+                "click_get_hooks_dir") as (enter, preloads):
+            enter()
+            self._setup_hooks_dir(preloads)
+            os.symlink("nonexistent", os.path.join(self.hooks_dir, "foo.hook"))
+            self.assertRaisesHooksError(
+                Click.HooksError.NO_SUCH_HOOK, Click.Hook.open, self.db, "foo")
+
     def test_hook_name_absent(self):
         with self.run_in_subprocess(
                 "click_get_hooks_dir") as (enter, preloads):
@@ -205,6 +216,12 @@
             self.assertRaisesHooksError(
                 Click.HooksError.BAD_APP_NAME, hook.get_app_id,
                 "package", "0.1", "app/name")
+            self.assertRaisesHooksError(
+                Click.HooksError.BAD_APP_NAME, hook.get_pattern,
+                "package", "0.1", "app_name")
+            self.assertRaisesHooksError(
+                Click.HooksError.BAD_APP_NAME, hook.get_pattern,
+                "package", "0.1", "app/name")
 
     def test_short_id_invalid(self):
         with self.run_in_subprocess(
@@ -250,6 +267,21 @@
             self.assertEqual(
                 [[b"/bin/sh", b"-c", b"test-update"]], self.spawn_calls)
 
+    def test_run_commands_fail(self):
+        with self.run_in_subprocess(
+                "click_get_hooks_dir", "g_spawn_sync") as (enter, preloads):
+            enter()
+            self._setup_hooks_dir(preloads)
+            preloads["g_spawn_sync"].side_effect = partial(
+                self.g_spawn_sync_side_effect, {b"/bin/sh": 1})
+            with mkfile(os.path.join(self.temp_dir, "test.hook")) as f:
+                print("Exec: test-update", file=f)
+                print("User: root", file=f)
+            hook = Click.Hook.open(self.db, "test")
+            self.assertRaisesHooksError(
+                Click.HooksError.COMMAND_FAILED, hook.run_commands,
+                user_name=None)
+
     def test_install_package(self):
         with self.run_in_subprocess(
                 "click_get_hooks_dir") as (enter, preloads):
@@ -481,6 +513,8 @@
                 "${home}/.local/share/test/${id}.test",
                 hook.get_field("pattern"))
             self.assertEqual("test-update", hook.get_field("exec"))
+            self.assertRaisesHooksError(
+                Click.HooksError.MISSING_FIELD, hook.get_field, "nonexistent")
             self.assertTrue(hook.props.is_user_level)
 
     def test_hook_name_absent(self):
@@ -523,6 +557,12 @@
             self.assertRaisesHooksError(
                 Click.HooksError.BAD_APP_NAME, hook.get_app_id,
                 "package", "0.1", "app/name")
+            self.assertRaisesHooksError(
+                Click.HooksError.BAD_APP_NAME, hook.get_pattern,
+                "package", "0.1", "app_name")
+            self.assertRaisesHooksError(
+                Click.HooksError.BAD_APP_NAME, hook.get_pattern,
+                "package", "0.1", "app/name")
 
     def test_short_id_valid(self):
         with self.run_in_subprocess(
@@ -559,6 +599,21 @@
             self.assertEqual(
                 [[b"/bin/sh", b"-c", b"test-update"]], self.spawn_calls)
 
+    def test_run_commands_fail(self):
+        with self.run_in_subprocess(
+                "click_get_hooks_dir", "g_spawn_sync") as (enter, preloads):
+            enter()
+            self._setup_hooks_dir(preloads)
+            preloads["g_spawn_sync"].side_effect = partial(
+                self.g_spawn_sync_side_effect, {b"/bin/sh": 1})
+            with mkfile(os.path.join(self.temp_dir, "test.hook")) as f:
+                print("User-Level: yes", file=f)
+                print("Exec: test-update", file=f)
+            hook = Click.Hook.open(self.db, "test")
+            self.assertRaisesHooksError(
+                Click.HooksError.COMMAND_FAILED, hook.run_commands,
+                user_name=self.TEST_USER)
+
     def test_install_package(self):
         with self.run_in_subprocess(
                 "click_get_hooks_dir", "click_get_user_home",
@@ -693,12 +748,14 @@
 
     def test_install(self):
         with self.run_in_subprocess(
-                "click_get_hooks_dir", "click_get_user_home",
+                "click_get_hooks_dir", "click_get_user_home", "getpwnam"
                 ) as (enter, preloads):
             enter()
             # Don't tell click about the hooks directory yet.
             self._setup_hooks_dir(preloads)
             preloads["click_get_user_home"].return_value = "/home/test-user"
+            preloads["getpwnam"].side_effect = (
+                lambda name: self.make_pointer(Passwd(pw_uid=1, pw_gid=1)))
             with mkfile(os.path.join(self.temp_dir, "hooks", "new.hook")) as f:
                 print("User-Level: yes", file=f)
                 print("Pattern: %s/${id}.new" % self.temp_dir, file=f)

=== modified file 'click/tests/test_osextras.py'
--- click/tests/test_osextras.py	2014-03-03 21:26:40 +0000
+++ click/tests/test_osextras.py	2014-08-06 23:22:03 +0000
@@ -113,6 +113,11 @@
         self.use_temp_dir()
         self.mod = Click
 
+    def test_ensuredir_error(self):
+        path = os.path.join(self.temp_dir, "file")
+        touch(path)
+        self.assertRaisesFileError(mock.ANY, self.mod.ensuredir, path)
+
     def test_dir_read_name_directory_present(self):
         new_dir = os.path.join(self.temp_dir, "dir")
         touch(os.path.join(new_dir, "file"))
@@ -136,6 +141,17 @@
         os.mkdir(path)
         self.assertRaisesFileError(mock.ANY, self.mod.unlink_force, path)
 
+    def test_symlink_unlink_error(self):
+        path = os.path.join(self.temp_dir, "dir")
+        os.mkdir(path)
+        self.assertRaisesFileError(
+            mock.ANY, self.mod.symlink_force, "source", path)
+
+    def test_symlink_error(self):
+        path = os.path.join(self.temp_dir, "dir", "file")
+        self.assertRaisesFileError(
+            mock.ANY, self.mod.symlink_force, "source", path)
+
 
 class TestOSExtrasPython(TestCase, TestOSExtrasBaseMixin):
     def setUp(self):
@@ -143,6 +159,11 @@
         self.use_temp_dir()
         self.mod = osextras
 
+    def test_ensuredir_oserror(self):
+        path = os.path.join(self.temp_dir, "file")
+        touch(path)
+        self.assertRaises(OSError, self.mod.ensuredir, path)
+
     def test_listdir_directory_present(self):
         new_dir = os.path.join(self.temp_dir, "dir")
         touch(os.path.join(new_dir, "file"))
@@ -161,3 +182,12 @@
         path = os.path.join(self.temp_dir, "dir")
         os.mkdir(path)
         self.assertRaises(OSError, self.mod.unlink_force, path)
+
+    def test_symlink_unlink_oserror(self):
+        path = os.path.join(self.temp_dir, "dir")
+        os.mkdir(path)
+        self.assertRaises(OSError, self.mod.symlink_force, "source", path)
+
+    def test_symlink_oserror(self):
+        path = os.path.join(self.temp_dir, "dir", "file")
+        self.assertRaises(OSError, self.mod.symlink_force, "source", path)

=== added file 'click/tests/test_paths.py.in'
--- click/tests/test_paths.py.in	1970-01-01 00:00:00 +0000
+++ click/tests/test_paths.py.in	2014-08-06 23:22:03 +0000
@@ -0,0 +1,42 @@
+# Copyright (C) 2013 Canonical Ltd.
+# Author: Colin Watson <[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/>.
+
+"""Unit tests for click.paths.
+
+This is mostly just to reduce noise in the coverage report.
+"""
+
+from __future__ import print_function
+
+__metaclass__ = type
+__all__ = [
+    'TestClickPaths',
+    ]
+
+
+from gi.repository import Click
+
+from click.tests.helpers import TestCase
+
+
+class TestClickPaths(TestCase):
+    def test_get_hooks_dir(self):
+        self.assertEqual("@pkgdatadir@/hooks", Click.get_hooks_dir())
+
+    def test_get_db_dir(self):
+        self.assertEqual("@sysconfdir@/click/databases", Click.get_db_dir())
+
+    def test_get_frameworks_dir(self):
+        self.assertEqual("@pkgdatadir@/frameworks", Click.get_frameworks_dir())

=== modified file 'click/tests/test_user.py'
--- click/tests/test_user.py	2014-05-30 09:09:20 +0000
+++ click/tests/test_user.py	2014-08-06 23:22:03 +0000
@@ -27,11 +27,11 @@
 import os
 import shutil
 
-from gi.repository import Click
+from gi.repository import Click, GLib
 
 from click.json_helpers import json_array_to_python, json_object_to_python
 from click.tests.gimock_types import Passwd
-from click.tests.helpers import TestCase, mkfile
+from click.tests.helpers import TestCase, mkfile, touch
 
 
 class TestClickUser(TestCase):
@@ -92,6 +92,17 @@
                 os.path.join(db_root, ".click", "users", "test-user"),
                 registry.get_overlay_db())
 
+    def test_new_db_not_directory(self):
+        with self.run_in_subprocess(
+                "click_get_db_dir", "g_get_user_name") as (enter, preloads):
+            enter()
+            path = os.path.join(self.temp_dir, "file")
+            touch(path)
+            preloads["click_get_db_dir"].side_effect = (
+                lambda: self.make_string(path))
+            self.assertRaisesFileError(
+                GLib.FileError.NOTDIR, Click.User.for_user, None, None)
+
     def test_get_overlay_db(self):
         self.assertEqual(
             os.path.join(self.temp_dir, ".click", "users", "user"),
@@ -141,6 +152,46 @@
             preloads["chown"].assert_any_call(
                 os.path.join(click_dir, "users", "user").encode(), 2, 2)
 
+    def test_ensure_db_mkdir_fails(self):
+        with self.run_in_subprocess("mkdir") as (enter, preloads):
+            enter()
+            preloads["mkdir"].return_value = -1
+            registry = Click.User.for_user(self.db, "user")
+            self.assertRaisesUserError(
+                Click.UserError.CREATE_DB, registry.set_version, "a", "1.0")
+
+    def test_ensure_db_chown_fails(self):
+        with self.run_in_subprocess(
+                "chown", "geteuid", "getpwnam") as (enter, preloads):
+            enter()
+            preloads["geteuid"].return_value = 0
+            getpwnam_result = Passwd()
+
+            def getpwnam_side_effect(name):
+                if name == b"clickpkg":
+                    getpwnam_result.pw_uid = 1
+                    getpwnam_result.pw_gid = 1
+                else:
+                    getpwnam_result.pw_uid = 2
+                    getpwnam_result.pw_gid = 2
+                return self.make_pointer(getpwnam_result)
+
+            preloads["getpwnam"].side_effect = getpwnam_side_effect
+            preloads["chown"].return_value = -1
+            registry = Click.User.for_user(self.db, "user")
+            self.assertRaisesUserError(
+                Click.UserError.CHOWN_DB, registry.set_version, "a", "1.0")
+
+    def test_ensure_db_getpwnam_fails(self):
+        with self.run_in_subprocess(
+                "geteuid", "getpwnam") as (enter, preloads):
+            enter()
+            preloads["geteuid"].return_value = 0
+            preloads["getpwnam"].return_value = None
+            registry = Click.User.for_user(self.db, "user")
+            self.assertRaisesUserError(
+                Click.UserError.GETPWNAM, registry.set_version, "a", "1.0")
+
     def test_get_package_names_missing(self):
         db = Click.DB()
         db.add(os.path.join(self.temp_dir, "nonexistent"))

=== modified file 'debian/changelog'
--- debian/changelog	2014-07-04 15:10:01 +0000
+++ debian/changelog	2014-08-06 23:22:03 +0000
@@ -1,3 +1,18 @@
+click (0.4.30) UNRELEASED; urgency=medium
+
+  [ Colin Watson ]
+  * Add many more unit tests to fill in some gaps in the coverage report.
+  
+  [ Michael Vogt ]
+  * Exclude non-existing users from User.get_user_names() 
+    (LP: #1334611)
+
+  [ Zoltan Balogh ]
+  * Add a set of APIs to the 14.10 frameworks.  Add ubuntu-ui-toolkit-doc to
+    all frameworks.
+
+ -- Michael Vogt <[e-mail]>  Fri, 11 Jul 2014 19:17:47 +0200
+
 click (0.4.29.1) utopic; urgency=medium
 
   [ Michael Vogt ]

=== modified file 'lib/click/user.vala'
--- lib/click/user.vala	2014-05-30 09:09:20 +0000
+++ lib/click/user.vala	2014-08-06 23:22:03 +0000
@@ -195,6 +195,10 @@
 			foreach (var entry in Click.Dir.open (users_db)) {
 				if (entry in seen)
 					continue;
+				// the user is not a pseudo user and does not/no-longer exist
+				if (!entry.has_prefix ("@") &&
+					Posix.getpwnam (entry) == null)
+					continue;
 				var path = Path.build_filename (users_db,
 								entry);
 				if (is_dir (path)) {

=== modified file 'tests/integration/helpers.py'
--- tests/integration/helpers.py	2014-07-03 12:55:50 +0000
+++ tests/integration/helpers.py	2014-08-06 23:22:03 +0000
@@ -22,7 +22,6 @@
 import random
 import shutil
 import string
-import shutil
 import subprocess
 import tempfile
 import unittest
@@ -31,6 +30,7 @@
 def is_root():
     return os.getuid() == 0
 
+
 def has_network():
     return subprocess.call(
         ["ping", "-c1", "archive.ubuntu.com"]) == 0
@@ -55,6 +55,7 @@
     def setUp(self):
         super(ClickTestCase, self).setUp()
         self.temp_dir = tempfile.mkdtemp()
+
     def tearDown(self):
         super(ClickTestCase, self).tearDown()
         # we force the cleanup before removing the tempdir so that stuff
@@ -64,13 +65,14 @@
 
     def _create_manifest(self, target, name, version, framework, hooks={}):
         with open(target, "w") as f:
-            json.dump({'name': name,
-                       'version': str(version),
-                       'maintainer': 'Foo Bar <[e-mail]>',
-                       'title': 'test title',
-                       'framework': framework,
-                       'hooks': hooks,
-                   }, f)
+            json.dump({
+                'name': name,
+                'version': str(version),
+                'maintainer': 'Foo Bar <[e-mail]>',
+                'title': 'test title',
+                'framework': framework,
+                'hooks': hooks,
+                }, f)
 
     def _make_click(self, name=None, version=1.0,
                     framework="ubuntu-sdk-13.10", hooks={}):

=== modified file 'tests/integration/test_build_core_apps.py'
--- tests/integration/test_build_core_apps.py	2014-07-02 18:21:32 +0000
+++ tests/integration/test_build_core_apps.py	2014-08-06 23:22:03 +0000
@@ -36,7 +36,7 @@
 ]
 
 # command to "configure"
-CORE_APP_CONFIGURE_CMD  = [
+CORE_APP_CONFIGURE_CMD = [
     "cmake", "..", "-DCLICK_MODE=on", "-DINSTALL_TESTS=off"]
 
 # command to make install
@@ -103,9 +103,9 @@
             branch_dir = branch[len("lp:"):]
             build_dir = os.path.join(branch_dir, "build-tree")
             if os.path.exists(branch_dir):
-                subprocess.check_call(["bzr","pull"], cwd=branch_dir)
+                subprocess.check_call(["bzr", "pull"], cwd=branch_dir)
             else:
-                subprocess.check_call(["bzr","branch", branch])
+                subprocess.check_call(["bzr", "branch", branch])
             manifest = find_manifest(branch_dir)
             # build it
             self._set_arch_and_framework_from_manifest(manifest)
@@ -117,6 +117,3 @@
                 self.configure()
                 self.make()
                 self.create_click()
-                
-
-                

=== modified file 'tests/integration/test_chroot.py'
--- tests/integration/test_chroot.py	2014-07-02 17:16:36 +0000
+++ tests/integration/test_chroot.py	2014-08-06 23:22:03 +0000
@@ -24,6 +24,7 @@
     ClickTestCase,
 )
 
+
 @unittest.skipIf(not is_root(), "This tests needs to run as root")
 @unittest.skipIf(not has_network(), "Need network")
 class TestChroot(ClickTestCase):

=== modified file 'tests/integration/test_hook.py'
--- tests/integration/test_hook.py	2014-07-04 14:35:59 +0000
+++ tests/integration/test_hook.py	2014-08-06 23:22:03 +0000
@@ -55,20 +55,20 @@
         subprocess.check_call(
             [self.click_binary, "hook", "install", hook_name])
         self.addCleanup(
-            subprocess.check_call, [self.click_binary, "hook", "remove", 
+            subprocess.check_call, [self.click_binary, "hook", "remove",
                                     hook_name])
         # make click that uses the hook
-        hooks = {'app1' : {hook_name: 'README'}}
+        hooks = {'app1': {hook_name: 'README'}}
         click_pkg_name = "com.example.hook-1"
         click_pkg = self._make_click(
             click_pkg_name, framework="", hooks=hooks)
         user = os.environ.get("USER", "root")
-        subprocess.check_call([
-            self.click_binary, "install", "--user=%s" % user, click_pkg],
-                              universal_newlines=True)
+        subprocess.check_call(
+            [self.click_binary, "install", "--user=%s" % user, click_pkg],
+            universal_newlines=True)
         self.addCleanup(
-            subprocess.check_call, 
-            [self.click_binary, "unregister","--user=%s" % user,
+            subprocess.check_call,
+            [self.click_binary, "unregister", "--user=%s" % user,
              click_pkg_name])
         # ensure we have the hook
         generated_hook_file = os.path.expanduser(