Merge lp:~larryprice/libertine/new-list-apps into lp:libertine

[Larry Price]

Migrate the list-apps subcommand to list application ids.

Migrate the list-apps subcommand to list application ids.

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:391
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/368/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/707/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/717
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/698/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/698/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/698/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/698/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/368/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/libertine/new-list-apps]

392. By Larry Price on 2017-02-07

missed a spot

[Libertine CI Bot (libertine-ci-bot)]

FAILED: Continuous integration, rev:392
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/370/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/709/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/719
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/700/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/700/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/700/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/700/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/370/rebuild

review: Needs Fixing (continuous-integration)

[lp:~larryprice/libertine/new-list-apps]

393. By Larry Price on 2017-02-07

test method was using wrong dbus service giving false positive

[Libertine CI Bot (libertine-ci-bot)]

PASSED: Continuous integration, rev:393
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/371/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/710
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/581
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/581
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/581
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/581
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/720
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/701
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/701
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/701
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/701/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/701
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/701/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/371/rebuild

review: Approve (continuous-integration)

[Christopher Townsend (townsend)]

lgtm

review: Approve

=== modified file 'debian/python3-libertine.install'
--- debian/python3-libertine.install	2017-01-31 18:21:43 +0000
+++ debian/python3-libertine.install	2017-02-07 13:30:52 +0000
@@ -1,4 +1,3 @@
-usr/lib/python*/*/libertine/AppDiscovery.py
 usr/lib/python*/*/libertine/ContainersConfig.py
 usr/lib/python*/*/libertine/HostInfo.py
 usr/lib/python*/*/libertine/Libertine.py

=== removed file 'python/libertine/AppDiscovery.py'
--- python/libertine/AppDiscovery.py	2017-01-17 21:46:43 +0000
+++ python/libertine/AppDiscovery.py	1970-01-01 00:00:00 +0000
@@ -1,220 +0,0 @@
-# Copyright 2015 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
-
-from . import utils
-from xdg.BaseDirectory import xdg_data_dirs
-import configparser
-import glob
-import io
-import json
-import os
-import re
-import sys
-
-
-class IconCache(object):
-    """
-    Caches the names of all icon files available in the standard places (possibly
-    in a container) and provides a search function to deliver icon file names
-    matching a given icon name.
-
-    See the `Freedesktop.org icon theme specification
-    <http://standards.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html>`_
-    for the detailed specification.
-    """
-
-    def __init__(self, root_path, file_loader=None):
-        """
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path string.
-        :param file_loader: A function that builds a cache of filenames.
-        :type file_loader: Function returning a list of filenames.
-        """
-        if file_loader:
-            self._icon_cache = file_loader(root_path)
-        else:
-            self._icon_cache = self._file_loader(root_path)
-
-    def _get_icon_search_paths(self, root_path):
-        """
-        Gets a list of paths on which to search for icons.
-
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path string.
-        :rtype: A list of filesystem patch to serarch for qualifying icon files.
-        """
-        icon_search_paths = []
-        icon_search_paths.append(os.path.join(root_path, os.environ['HOME'], ".icons"))
-        for d in reversed(xdg_data_dirs):
-            icon_search_paths.append(os.path.join(root_path, d.lstrip('/'), "icons"))
-        icon_search_paths.append(os.path.join(root_path, "usr/share/pixmaps"))
-        return icon_search_paths
-
-    def _file_loader(self, root_path):
-        """
-        Loads a cache of file names by scanning the filesystem rooted at
-        ``root_path``.
-
-        :param root_path: Where to start the file scan.
-        :type root_path: A valid filesystem path.
-        :rtype: A list of fully-qualified file paths.
-        """
-        file_names = []
-        pattern = re.compile(r".*\.(png|svg|xpm)")
-        for path in self._get_icon_search_paths(root_path):
-            for base, dirs, files in os.walk(path):
-                for file in files:
-                    if pattern.match(file):
-                        file_names.append(os.path.join(base, file))
-        return file_names
-
-    def _find_icon_files(self, icon_name):
-        """
-        Finds a list of file name strings matching the given icon name.
-
-        :param icon_name: An icon name, pobably from a .desktop file.
-        :rtype: A list of filename strings matching the icon name.
-        """
-        icon_file_names = []
-        match_string = r"/" + os.path.splitext(icon_name)[0] + r"\....$"
-        pattern = re.compile(match_string)
-        for icon_file in self._icon_cache:
-            if pattern.search(icon_file):
-                icon_file_names.append(icon_file)
-        return icon_file_names
-
-    def expand_icons(self, desktop_icon_list):
-        """
-        Expands a string containing a list of icon names into a list of matching
-        file names.
-
-        :param desktop_icon_list: A string containing a list of icon names
-        separated by semicolons.
-        :rtype: A list of filename stings matching the icon names passed in.
-
-        See `the Freedesktop.org desktop file specification
-        <http://standards.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys>`_
-        for more information.
-        """
-        if desktop_icon_list:
-            icon_list = desktop_icon_list.split(';')
-            if icon_list[0][0] == '/':
-                return icon_list
-            icon_files = []
-            for i in icon_list:
-                icon_files += self._find_icon_files(i)
-            return icon_files
-        return []
-
-
-def expand_mime_types(desktop_mime_types):
-    if desktop_mime_types:
-        return desktop_mime_types.split(';')
-    return []
-
-
-class AppInfo(object):
-
-    def __init__(self, desktop_file_name, config_entry, icon_cache):
-        self.desktop_file_name = desktop_file_name
-        self.name = config_entry.get('Name')
-        if not self.name:
-            raise RuntimeError("required Name attribute is missing")
-        d = config_entry.get('NoDisplay')
-        self.no_display = (d != None and d == 'true')
-        self.exec_line = config_entry.get('Exec')
-        if not self.exec_line:
-            raise RuntimeError("required Exec attribute is missing")
-        self.icons = icon_cache.expand_icons(config_entry.get('Icon'))
-        self.mime_types = expand_mime_types(config_entry.get('MimeType'))
-
-    def __str__(self):
-        with io.StringIO() as ostr:
-            print(self.name, file=ostr)
-            print("  desktop_file={}".format(self.desktop_file_name), file=ostr)
-            print("  no-display={}".format(self.no_display), file=ostr)
-            print("  exec='{}'".format(self.exec_line), file=ostr)
-            for icon in self.icons:
-                print("  icon: {}".format(icon), file=ostr)
-            for mime in self.mime_types:
-                print("  mime: {}".format(mime), file=ostr)
-            return ostr.getvalue()
-
-    def to_json(self):
-        return json.dumps(self.__dict__)
-
-
-def desktop_file_is_showable(desktop_entry):
-    """
-    Determines if a particular application entry should be reported:  the entry
-    can not be hidden and must be showable in Unity.
-    """
-    t = desktop_entry.get('Type')
-    if t != 'Application':
-        return False
-    n = desktop_entry.get('Hidden')
-    if n and n == 'true':
-        return False
-    n = desktop_entry.get('NoShowIn')
-    if n:
-        targets = n.split(';')
-        if 'Unity' in targets:
-            return False
-    n = desktop_entry.get('OnlyShowIn')
-    if n:
-        targets = n.split(';')
-        if 'Unity' not in targets:
-            return False
-    return True
-
-
-def get_app_info(desktop_path, icon_cache):
-    for desktop_file_name in glob.glob(desktop_path):
-        desktop_file = configparser.ConfigParser(strict=False, interpolation=None)
-        try:
-            desktop_file.read(desktop_file_name)
-            desktop_entry = desktop_file['Desktop Entry']
-            if desktop_file_is_showable(desktop_entry):
-                    yield AppInfo(desktop_file_name, desktop_entry, icon_cache)
-        except Exception as ex:
-            utils.get_logger().error("error processing {}: {}".format(desktop_file_name, ex))
-
-
-class AppLauncherCache(object):
-    """
-    Caches a list of application launcher information (derived from .desktop
-    files installed in a container.
-    """
-
-    def __init__(self, name, root_path):
-        self.name = name
-        self.app_launchers = []
-        icon_cache = IconCache(root_path)
-        for dir in reversed(xdg_data_dirs):
-            path = os.path.join(root_path, dir.lstrip('/'), "applications")
-            for app_info in get_app_info(os.path.join(path, "*.desktop"), icon_cache):
-                self.app_launchers.append(app_info)
-
-    def __str__(self):
-        with io.StringIO() as ostr:
-            print("{}\n".format(self.name), file=ostr)
-            for app_info in self.app_launchers:
-                print("  {}".format(app_info), file=ostr)
-            return ostr.getvalue()
-
-    def to_json(self):
-        return json.dumps(self,
-                          default=lambda o: o.__dict__,
-                          sort_keys=True,
-                          indent=4)

=== modified file 'python/libertine/Libertine.py'
--- python/libertine/Libertine.py	2017-02-01 21:13:14 +0000
+++ python/libertine/Libertine.py	2017-02-07 13:30:52 +0000
@@ -12,7 +12,6 @@
 # You should have received a copy of the GNU General Public License along
 # with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from .AppDiscovery import AppLauncherCache
 import abc
 import contextlib
 import os
@@ -525,23 +524,6 @@
         """
         self.container.finish_application(app)
 
-    def list_app_launchers(self, use_json=False):
-        """
-        Enumerates all application launchers (based on .desktop files) available
-        in the container.
-
-        :param use_json: Indicates the returned string should be in JSON format.
-            The default format is some human-readble format.
-        :rtype: A printable string containing a list of application launchers
-            available in the container.
-        """
-        if use_json:
-            return AppLauncherCache(self.container.name,
-                                    self.container.root_path).to_json()
-        else:
-            return str(AppLauncherCache(self.container.name,
-                                        self.container.root_path))
-
     def list_app_ids(self):
         """
         Finds application ids (based on .desktop files) available in the

=== modified file 'python/libertine/service/container.py'
--- python/libertine/service/container.py	2017-01-24 16:03:25 +0000
+++ python/libertine/service/container.py	2017-02-07 13:30:52 +0000
@@ -144,15 +144,6 @@
         task.start()
         return task.id
 
-    def list_apps(self):
-        utils.get_logger().debug("List all apps in container '%s'" % self.id)
-
-        task = ListAppsTask(self.id, self._config, self._connection, self._cleanup_task)
-
-        self._tasks.append(task)
-        task.start()
-        return task.id
-
     def list_app_ids(self):
         utils.get_logger().debug("List all app ids in container '%s'" % self.id)
 

=== modified file 'python/libertine/service/manager.py'
--- python/libertine/service/manager.py	2017-01-31 19:24:32 +0000
+++ python/libertine/service/manager.py	2017-02-07 13:30:52 +0000
@@ -69,13 +69,6 @@
     @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
                          in_signature='s',
                          out_signature='o')
-    def list_apps(self, container_id):
-        utils.get_logger().debug("list_apps('{}')".format(container_id))
-        return self._dispatcher.list_apps(container_id)
-
-    @dbus.service.method(LIBERTINE_MANAGER_INTERFACE,
-                         in_signature='s',
-                         out_signature='o')
     def list_app_ids(self, container_id):
         utils.get_logger().debug("list_app_ids('{}')".format(container_id))
         return self._dispatcher.list_app_ids(container_id)

=== modified file 'python/libertine/service/task_dispatcher.py'
--- python/libertine/service/task_dispatcher.py	2017-01-24 18:00:57 +0000
+++ python/libertine/service/task_dispatcher.py	2017-02-07 13:30:52 +0000
@@ -84,10 +84,6 @@
         utils.get_logger().debug("dispatching update container '%s'" % container_id)
         return self._find_or_create_container(container_id).update()
 
-    def list_apps(self, container_id):
-        utils.get_logger().debug("dispatching list all apps in container '%s'" % container_id)
-        return self._find_or_create_container(container_id).list_apps()
-
     def list_app_ids(self, container_id):
         utils.get_logger().debug("dispatching list apps ids in container '%s'" % container_id)
         return self._find_or_create_container(container_id).list_app_ids()

=== modified file 'python/libertine/service/tasks/__init__.py'
--- python/libertine/service/tasks/__init__.py	2017-01-24 18:00:57 +0000
+++ python/libertine/service/tasks/__init__.py	2017-02-07 13:30:52 +0000
@@ -22,7 +22,6 @@
 from .search_task import SearchTask
 from .update_task import UpdateTask
 from .list_task import ListTask
-from .list_apps_task import ListAppsTask
 from .list_app_ids_task import ListAppIdsTask
 
 __all__ = [
@@ -36,6 +35,5 @@
           'SearchTask',
           'UpdateTask',
           'ListTask',
-          'ListAppsTask',
           'ListAppIdsTask'
           ]

=== removed file 'python/libertine/service/tasks/list_apps_task.py'
--- python/libertine/service/tasks/list_apps_task.py	2017-01-11 17:28:54 +0000
+++ python/libertine/service/tasks/list_apps_task.py	1970-01-01 00:00:00 +0000
@@ -1,34 +0,0 @@
-# Copyright 2016-2017 Canonical Ltd.
-#
-# 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/>.
-
-
-from .base_task import BaseTask
-from libertine import LibertineContainer, utils
-
-
-class ListAppsTask(BaseTask):
-    def __init__(self, container_id, config, connection, callback):
-        super().__init__(lock=None, container_id=container_id, config=config, connection=connection, callback=callback)
-
-    def _run(self):
-        utils.get_logger().debug("Listing apps in container '%s'" % self._container)
-        container = LibertineContainer(self._container, self._config)
-        self._progress.data(str(container.list_app_launchers(use_json=True)))
-
-    def _before(self):
-        if not self._config.container_exists(self._container):
-            self._progress.error("Container '%s' does not exist, skipping list" % self._container)
-            return False
-
-        return True

=== modified file 'tests/integration/test_libertine_service.py'
--- tests/integration/test_libertine_service.py	2017-01-24 18:00:57 +0000
+++ tests/integration/test_libertine_service.py	2017-02-07 13:30:52 +0000
@@ -147,8 +147,7 @@
             config = ContainersConfig()
 
             self._send(lambda: self._libertined.create('jarjar', 'JarJar Binks', 'xenial', 'mock'))
-            self.assertEqual({'name': 'JarJar Binks', 'app_launchers': []},
-                             ast.literal_eval(self._send(lambda: self._libertined.list_apps('jarjar'))))
+            self.assertEqual([], ast.literal_eval(self._send(lambda: self._libertined.list_app_ids('jarjar'))))
 
             self._send(lambda: self._libertined.install('jarjar', 'the-force'))
             config.refresh_database()

=== modified file 'tests/unit/service/tasks/CMakeLists.txt'
--- tests/unit/service/tasks/CMakeLists.txt	2017-01-20 18:30:21 +0000
+++ tests/unit/service/tasks/CMakeLists.txt	2017-02-07 13:30:52 +0000
@@ -4,7 +4,6 @@
 create_service_unit_test(test_destroy_task)
 create_service_unit_test(test_install_task)
 create_service_unit_test(test_list_task)
-create_service_unit_test(test_list_apps_task)
 create_service_unit_test(test_list_app_ids_task)
 create_service_unit_test(test_remove_task)
 create_service_unit_test(test_search_task)

=== modified file 'tests/unit/service/tasks/test_list_app_ids_task.py'
--- tests/unit/service/tasks/test_list_app_ids_task.py	2017-01-20 18:30:21 +0000
+++ tests/unit/service/tasks/test_list_app_ids_task.py	2017-02-07 13:30:52 +0000
@@ -36,7 +36,7 @@
             task = tasks.ListAppIdsTask('palpatine', self.config, self.connection, self.callback)
             task._instant_callback = True
 
-            with unittest.mock.patch('libertine.service.tasks.list_apps_task.LibertineContainer') as MockContainer:
+            with unittest.mock.patch('libertine.service.tasks.list_app_ids_task.LibertineContainer') as MockContainer:
                 task.start().join()
 
             progress.error.assert_called_once_with('Container \'palpatine\' does not exist, skipping list')

=== removed file 'tests/unit/service/tasks/test_list_apps_task.py'
--- tests/unit/service/tasks/test_list_apps_task.py	2016-11-07 18:51:17 +0000
+++ tests/unit/service/tasks/test_list_apps_task.py	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-# Copyright 2016 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
-
-
-import unittest.mock
-from unittest import TestCase
-from libertine.service import tasks
-from libertine.ContainersConfig import ContainersConfig
-
-
-class TestListAppsTask(TestCase):
-    def setUp(self):
-        self.config      = unittest.mock.create_autospec(ContainersConfig)
-        self.connection  = unittest.mock.Mock()
-        self.lock      = unittest.mock.MagicMock()
-        self.called_with = None
-
-    def callback(self, task):
-        self.called_with = task
-
-    def test_sends_error_on_non_existent_container(self):
-        self.config.container_exists.return_value = False
-        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
-            progress = MockProgress.return_value
-            task = tasks.ListAppsTask('palpatine', self.config, self.connection, self.callback)
-            task._instant_callback = True
-
-            with unittest.mock.patch('libertine.service.tasks.list_apps_task.LibertineContainer') as MockContainer:
-                task.start().join()
-
-            progress.error.assert_called_once_with('Container \'palpatine\' does not exist, skipping list')
-            self.assertEqual(task, self.called_with)
-
-    def test_successfully_lists_apps(self):
-        self.config.container_exists.return_value = True
-        with unittest.mock.patch('libertine.service.tasks.base_task.libertine.service.progress.Progress') as MockProgress:
-            progress = MockProgress.return_value
-            progress.done = False
-            task = tasks.ListAppsTask('palpatine', self.config, self.connection, self.callback)
-            task._instant_callback = True
-
-            with unittest.mock.patch('libertine.service.tasks.list_apps_task.LibertineContainer') as MockContainer:
-                MockContainer.return_value.list_app_launchers.return_value = 'jarjar\nsidius'
-                task.start().join()
-
-            progress.finished.assert_called_once_with('palpatine')
-            progress.data.assert_called_once_with('jarjar\nsidius')
-            self.assertEqual(task, self.called_with)

=== modified file 'tests/unit/service/test_container.py'
--- tests/unit/service/test_container.py	2017-01-20 20:51:27 +0000
+++ tests/unit/service/test_container.py	2017-02-07 13:30:52 +0000
@@ -149,21 +149,13 @@
                 MockUpdateTask.assert_called_once_with('palpatine', self._config, unittest.mock.ANY, self._connection, unittest.mock.ANY)
                 MockUpdateTask.return_value.start.assert_called_once_with()
 
-    def test_list_apps_creates_list_apps_task(self):
-        with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
-            c = container.Container('palpatine', self._config, self._connection, lambda task: task)
-            with unittest.mock.patch('libertine.service.container.ListAppsTask') as MockListAppsTask:
-                c.list_apps()
-                MockListAppsTask.assert_called_once_with('palpatine', self._config, self._connection, unittest.mock.ANY)
-                MockListAppsTask.return_value.start.assert_called_once_with()
-
     def test_list_app_ids_creates_list_app_ids_task(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:
             c = container.Container('palpatine', self._config, self._connection, lambda task: task)
-            with unittest.mock.patch('libertine.service.container.ListAppIdsTask') as MockListAppsTask:
+            with unittest.mock.patch('libertine.service.container.ListAppIdsTask') as MockListAppIdsTask:
                 c.list_app_ids()
-                MockListAppsTask.assert_called_once_with('palpatine', self._config, self._connection, unittest.mock.ANY)
-                MockListAppsTask.return_value.start.assert_called_once_with()
+                MockListAppIdsTask.assert_called_once_with('palpatine', self._config, self._connection, unittest.mock.ANY)
+                MockListAppIdsTask.return_value.start.assert_called_once_with()
 
     def test_removes_task_during_callback(self):
         with unittest.mock.patch('libertine.service.container.apt.AptCache') as MockCache:

=== modified file 'tests/unit/service/test_task_dispatcher.py'
--- tests/unit/service/test_task_dispatcher.py	2017-01-20 20:51:27 +0000
+++ tests/unit/service/test_task_dispatcher.py	2017-02-07 13:30:52 +0000
@@ -76,14 +76,7 @@
             self.assertEqual(123, self._dispatcher.update('palpatine'))
             c.update.assert_called_once_with()
 
-    def test_list_apps_calls_list_apps_on_container(self):
-        with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
-            c = MockContainer.return_value
-            c.list_apps.return_value = 123
-            self.assertEqual(123, self._dispatcher.list_apps('palpatine'))
-            c.list_apps.assert_called_once_with()
-
-    def test_list_apps_calls_list_apps_on_container(self):
+    def test_list_app_ids_calls_list_app_ids_on_container(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
             c.list_app_ids.return_value = 123
@@ -94,20 +87,20 @@
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
             c.id = 'palpatine'
-            self._dispatcher.list_apps('palpatine')
-            self._dispatcher.list_apps('palpatine')
-            self._dispatcher.list_apps('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
             MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
 
     def test_container_callback_removes_container(self):
         with unittest.mock.patch('libertine.service.task_dispatcher.Container') as MockContainer:
             c = MockContainer.return_value
             c.id = 'palpatine'
-            self._dispatcher.list_apps('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
             MockContainer.assert_called_once_with('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
             name, args, kwargs = MockContainer.mock_calls[0]
             args[len(args)-1](MockContainer.return_value)
-            self._dispatcher.list_apps('palpatine')
+            self._dispatcher.list_app_ids('palpatine')
             MockContainer.assert_has_calls([ # verify container constructed twice
                 unittest.mock.call('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY),
                 unittest.mock.call('palpatine', unittest.mock.ANY, self._connection, unittest.mock.ANY)
@@ -128,7 +121,7 @@
                 c = MockContainer.return_value
                 c.tasks = [1, 2, 3]
                 c.id = 'palpatine'
-                self._dispatcher.list_apps('palpatine') # creates container
+                self._dispatcher.list_app_ids('palpatine') # creates container
                 self._dispatcher.container_info('palpatine')
             MockContainerInfoTask.assert_called_once_with('palpatine', [1, 2, 3], unittest.mock.ANY, self._connection, unittest.mock.ANY)
             task.start.assert_called_once_with()

=== removed file 'tests/unit/test_app_discovery.py'
--- tests/unit/test_app_discovery.py	2015-12-22 17:28:10 +0000
+++ tests/unit/test_app_discovery.py	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-"""Unit tests for the AppLauncher module."""
-# Copyright 2015 Canonical Ltd.
-#
-# This program is free software: you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 3, as published
-# by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranties of
-# MERCHANTABILITY, SATISFACTORY QUALITY, 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/>.
-
-from libertine.AppDiscovery import IconCache
-from testtools import TestCase
-from testtools.matchers import Equals
-
-
-class TestIconSearching(TestCase):
-
-    def mock_file_loader(self, root_path):
-        return [
-            "/some/path/128x128/icon.png",
-            "/somepath/icon.png",
-            "/somepath/testme.png"
-            ];
-
-    def test_full_path(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_full_path = "/this/is/a/full/path"
-        self.assertThat(icon_cache.expand_icons(some_full_path)[0],
-                        Equals(some_full_path))
-
-    def test_icon_name(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_icon_list = "testme"
-        self.assertThat(icon_cache.expand_icons(some_icon_list)[0],
-                        Equals("/somepath/testme.png"))
-
-    def test_edge_case_relative_file_name(self):
-        some_root = "/some_root"
-        icon_cache = IconCache(some_root, file_loader=self.mock_file_loader)
-
-        some_icon_list = "testme.png"
-        self.assertThat(icon_cache.expand_icons(some_icon_list)[0],
-                        Equals("/somepath/testme.png"))

=== modified file 'tools/libertine-container-manager'
--- tools/libertine-container-manager	2017-02-01 21:13:14 +0000
+++ tools/libertine-container-manager	2017-02-07 13:30:52 +0000
@@ -17,8 +17,9 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 import argparse
+import getpass
+import json
 import libertine.utils
-import getpass
 import os
 import sys
 import re
@@ -224,8 +225,12 @@
     def list_apps(self, args):
         container_id = self.containers_config.check_container_id(args.id)
 
-        container = LibertineContainer(container_id)
-        print(container.list_app_launchers(use_json=args.json))
+        app_ids = LibertineContainer(container_id).list_app_ids()
+        if args.json:
+            print(json.dumps(app_ids))
+        else:
+            for app in app_ids:
+                print(app)
 
     def exec(self, args):
         container_id = self.containers_config.check_container_id(args.id)