Merge lp:~larryprice/libertine/dbus-session-hack into lp:libertine

[Larry Price]

Politely wait for libertined to start during integration test to avoid activating system dbus service.

Update the libertined integration test to politely wait for the process to start to avoid activation of system dbus service.

[Christopher Townsend (townsend)]

Looks good. The dbus activated libertined service no longer starts:)

review: Approve

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

FAILED: Continuous integration, rev:393
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/376/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/libertine/job/build/720/console
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/730
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/711/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/711/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/711/console
    FAILURE: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/711/console

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

review: Needs Fixing (continuous-integration)

[lp:~larryprice/libertine/dbus-session-hack]

394. By Larry Price on 2017-02-08

add pexpect

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

PASSED: Continuous integration, rev:394
https://jenkins.canonical.com/libertine/job/lp-libertine-ci/377/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/libertine/job/build/721
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=xenial+overlay,testname=default/591
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=amd64,release=zesty,testname=default/591
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=xenial+overlay,testname=default/591
    SUCCESS: https://jenkins.canonical.com/libertine/job/test-0-autopkgtest/label=i386,release=zesty,testname=default/591
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-0-fetch/731
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/712
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=xenial+overlay/712/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/712
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=amd64,release=zesty/712/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/712
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=xenial+overlay/712/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/712
        deb: https://jenkins.canonical.com/libertine/job/build-2-binpkg/arch=i386,release=zesty/712/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-02-07 16:32:02 +0000
+++ debian/control	2017-02-08 17:08:42 +0000
@@ -23,6 +23,7 @@
                python3-distro-info,
                python3-gi,
                python3-lxc,
+               python3-pexpect,
                python3-psutil,
                python3-pytest,
                python3-testtools,

=== modified file 'tests/integration/CMakeLists.txt'
--- tests/integration/CMakeLists.txt	2017-02-07 12:58:34 +0000
+++ tests/integration/CMakeLists.txt	2017-02-08 17:08:42 +0000
@@ -1,4 +1,4 @@
-add_test(test_libertine_service dbus-run-session /usr/bin/python3 -m testtools.run test_libertine_service)
+add_test(test_libertine_service dbus-run-session -- /usr/bin/python3 -m testtools.run test_libertine_service)
 set_tests_properties(test_libertine_service
                      PROPERTIES ENVIRONMENT
                    "GI_TYPELIB_PATH=${CMAKE_BINARY_DIR}/liblibertine;LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/liblibertine:${LD_LIBRARY_PATH};PYTHONPATH=${CMAKE_CURRENT_SOURCE_DIR}:${CMAKE_SOURCE_DIR}/python;LIBERTINE_DATA_DIR=${CMAKE_CURRENT_SOURCE_DIR};PATH=${CMAKE_SOURCE_DIR}/tools:$ENV{PATH};")

=== modified file 'tests/integration/test_libertine_service.py'
--- tests/integration/test_libertine_service.py	2017-02-07 13:30:36 +0000
+++ tests/integration/test_libertine_service.py	2017-02-08 17:08:42 +0000
@@ -17,6 +17,8 @@
 import dbus
 import dbus.mainloop.glib
 import os
+import pexpect
+import sys
 import tempfile
 import threading
 import time
@@ -44,7 +46,16 @@
         environ = os.environ.copy()
         environ['XDG_DATA_HOME'] = cls._tempdir.name
 
-        cls._process = Popen(['libertined', '--debug'], stdout=PIPE, stderr=PIPE, env=environ)
+        cls._process = pexpect.spawnu('libertined --debug', env=environ)
+        cls._process.logfile = sys.stdout
+
+        # give libertined enough time to start the whole process
+        verbosity = environ.get('LIBERTINE_DEBUG', '1')
+        if verbosity == '1':
+            cls._process.expect(['.+\n', pexpect.TIMEOUT], timeout=1)
+        elif environ['LIBERTINE_DEBUG'] == '2':
+            cls._process.expect(['.+\n.+\n.+\n', pexpect.TIMEOUT], timeout=1)
+
         dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
         cls._loop = GObject.MainLoop()
 
@@ -54,9 +65,7 @@
     @classmethod
     def tearDownClass(cls):
         cls._loop.quit()
-        cls._process.kill()
-        out, err = cls._process.communicate()
-        print(err)
+        cls._process.close()
         cls._tempdir.cleanup()
 
     def setUp(self):