Merge lp:~larryprice/libertine/missing-to-dicts into lp:libertine

[Larry Price]

Convert results to dicts on operation/application collision in container lifecycle managers.

Convert results to dicts on operation/application collision in container lifecycle managers.

I missed these earlier and they've gone unnoticed - need to convert LifecycleResult to a dictionary before sending over dbus on error.

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

FAILED: Continuous integration, rev:327
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/305/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/616
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/500
    FAILURE: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/500/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/500
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/500
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/626
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/607
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/607/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/607
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/607/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/607
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/607/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/607
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/607/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Christopher Townsend (townsend)]

Ok

review: Approve

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

PASSED: Continuous integration, rev:327
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/308/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/619
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/503
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/503
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/503
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/503
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/629
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/610
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/610/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/610
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/610/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/610
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/610/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/610
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/610/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'python/libertine/lifecycle/ContainerLifecycleService.py'
--- python/libertine/lifecycle/ContainerLifecycleService.py	2016-12-23 15:46:44 +0000
+++ python/libertine/lifecycle/ContainerLifecycleService.py	2017-01-09 18:16:58 +0000
@@ -55,7 +55,7 @@
     def app_start(self, container):
         utils.get_logger().debug("app_start({})".format(container))
         if self._operations[container] != 0:
-            return LifecycleResult("Libertine container operation already running: cannot launch application.")
+            return LifecycleResult("Libertine container operation already running: cannot launch application.").to_dict()
 
         result = self.start(container, True)
 
@@ -84,7 +84,7 @@
     def operation_start(self, container):
         utils.get_logger().debug("operation_start({})".format(container))
         if self._apps[container] != 0:
-            return LifecycleResult("Application already running in container: cannot run operation.")
+            return LifecycleResult("Application already running in container: cannot run operation.").to_dict()
 
         result = self.start(container, False)