Merge lp:~ted/ubuntu-app-launch/libertine-service into lp:ubuntu-app-launch

[Ted Gould]

Run the libertine-service in tests for new libertine >= 1.6

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:292
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/225/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1674/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1681
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1456/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1456/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1456/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1456/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1456/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1456/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/225/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/libertine-service]

293. By Ted Gould on 2017-02-14

Adding a wait for libertined to start in list apps

294. By Ted Gould on 2017-02-14

Add in more waits

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:293
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/226/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1679/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1686
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1461/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1461/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1461/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1461/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1461/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1461/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/226/rebuild

review: Needs Fixing (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:294
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/228/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1681/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1688
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1463/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1463/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1463/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1463/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1463/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1463/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/228/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/ubuntu-app-launch/libertine-service]

295. By Ted Gould on 2017-02-15

Goin' 'mock'

296. By Ted Gould on 2017-02-15

Increase debug messages from libertine service

[Ken VanDine (ken-vandine)]

Looks good and works

review: Approve

[unity-api-1-bot (unity-api-1-bot)]

FAILED: Continuous integration, rev:295
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/229/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1688/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1695
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1470/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1470/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1470/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1470/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1470/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1470/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-ubuntu-app-launch-ci/229/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'debian/control'
--- debian/control	2017-01-19 18:39:44 +0000
+++ debian/control	2017-02-15 15:03:59 +0000
@@ -15,6 +15,7 @@
                libcurl4-dev | libcurl4-gnutls-dev,
                libdbus-1-dev,
                libdbustest1-dev (>= 14.04.0),
+               libertined (>= 1.6),
                libgirepository1.0-dev,
                libglib2.0-dev,
                libgtest-dev,

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-01-19 18:52:33 +0000
+++ tests/CMakeLists.txt	2017-02-15 15:03:59 +0000
@@ -89,7 +89,7 @@
 
 add_executable (list-apps
 	list-apps.cpp)
-target_link_libraries (list-apps gtest_main ${GTEST_MAIN_LIBRARIES} launcher-static)
+target_link_libraries (list-apps gtest_main ${GTEST_MAIN_LIBRARIES} ${DBUSTEST_LIBRARIES} launcher-static)
 add_test (NAME list-apps COMMAND ${CMAKE_CURRENT_BINARY_DIR}/list-apps)
 
 # Application Info Desktop
@@ -181,6 +181,7 @@
 	eventually-fixture.h
 	jobs-base-test.cpp
 	jobs-systemd.cpp
+	libertine-service.h
 	registry-mock.h
 	snapd-info-test.cpp
 	snapd-mock.h

=== modified file 'tests/exec-util-test.cc'
--- tests/exec-util-test.cc	2017-01-19 18:52:33 +0000
+++ tests/exec-util-test.cc	2017-02-15 15:03:59 +0000
@@ -27,12 +27,14 @@
 #include <libubuntu-app-launch/registry.h>
 
 #include "eventually-fixture.h"
+#include "libertine-service.h"
 
 class ExecUtil : public EventuallyFixture
 {
 	protected:
 		DbusTestService * service = NULL;
 		DbusTestDbusMock * mock = NULL;
+		std::shared_ptr<LibertineService> libertine;
 		GDBusConnection * bus = NULL;
 		std::string laststarted;
 
@@ -75,6 +77,11 @@
 				NULL);
 
 			dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
+
+			libertine = std::make_shared<LibertineService>();
+			dbus_test_service_add_task(service, *libertine);
+			dbus_test_service_add_task(service, libertine->waitTask());
+
 			dbus_test_service_start_tasks(service);
 
 			bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
@@ -89,6 +96,7 @@
 			ubuntu_app_launch_observer_delete_app_starting(starting_cb, this);
 			ubuntu::app_launch::Registry::clearDefault();
 
+			libertine.reset();
 			g_clear_object(&mock);
 			g_clear_object(&service);
 

=== modified file 'tests/libertine-home/libertine/ContainersConfig.json'
--- tests/libertine-home/libertine/ContainersConfig.json	2016-07-28 19:11:32 +0000
+++ tests/libertine-home/libertine/ContainersConfig.json	2017-02-15 15:03:59 +0000
@@ -9,7 +9,7 @@
             ],
             "multiarch": "disabled",
             "name": "Container Name",
-            "type": "lxc"
+            "type": "mock"
         }
     ],
     "defaultContainer": "container-name"

=== added file 'tests/libertine-service.h'
--- tests/libertine-service.h	1970-01-01 00:00:00 +0000
+++ tests/libertine-service.h	2017-02-15 15:03:59 +0000
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 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.
+ *
+ * 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/>.
+ *
+ * Authors:
+ *      Ted Gould <[e-mail]>
+ */
+
+#include <gio/gio.h>
+
+#include <libdbustest/dbus-test.h>
+
+class LibertineService
+{
+private:
+    DbusTestProcess* process = nullptr;
+    DbusTestTask* wait = nullptr;
+
+public:
+    LibertineService()
+    {
+        g_setenv("LIBERTINE_DEBUG", "2", TRUE);
+
+        process = dbus_test_process_new("/usr/bin/libertined");
+        dbus_test_process_append_param(process, "--debug");
+
+        dbus_test_task_set_bus(DBUS_TEST_TASK(process), DBUS_TEST_SERVICE_BUS_SESSION);
+        dbus_test_task_set_name(DBUS_TEST_TASK(process), "libertine");
+        dbus_test_task_set_return(DBUS_TEST_TASK(process), DBUS_TEST_TASK_RETURN_IGNORE);
+        dbus_test_task_set_wait_finished(DBUS_TEST_TASK(process), FALSE);
+
+        wait = dbus_test_task_new();
+        dbus_test_task_set_wait_for(wait, "com.canonical.libertine.Service");
+    }
+
+    ~LibertineService()
+    {
+        g_debug("Destroying the Libertined Task");
+        g_clear_object(&process);
+        g_clear_object(&wait);
+    }
+
+    DbusTestTask* waitTask()
+    {
+        return wait;
+    }
+
+    operator std::shared_ptr<DbusTestTask>()
+    {
+        std::shared_ptr<DbusTestTask> retval(DBUS_TEST_TASK(g_object_ref(process)),
+                                             [](DbusTestTask* process) { g_clear_object(&process); });
+        return retval;
+    }
+
+    operator DbusTestTask*()
+    {
+        return DBUS_TEST_TASK(process);
+    }
+};

=== modified file 'tests/libual-cpp-test.cc'
--- tests/libual-cpp-test.cc	2017-01-19 19:12:46 +0000
+++ tests/libual-cpp-test.cc	2017-02-15 15:03:59 +0000
@@ -36,6 +36,7 @@
 #include "ubuntu-app-launch.h"
 
 #include "eventually-fixture.h"
+#include "libertine-service.h"
 #include "mir-mock.h"
 #include "spew-master.h"
 
@@ -51,6 +52,7 @@
     DbusTestService* service = NULL;
     DbusTestDbusMock* mock = NULL;
     DbusTestDbusMock* cgmock = NULL;
+    std::shared_ptr<LibertineService> libertine;
     GDBusConnection* bus = NULL;
     guint resume_timeout = 0;
     std::shared_ptr<ubuntu::app_launch::Registry> registry;
@@ -308,6 +310,12 @@
         /* Put it together */
         dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
         dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock));
+
+        /* Add in Libertine */
+        libertine = std::make_shared<LibertineService>();
+        dbus_test_service_add_task(service, *libertine);
+        dbus_test_service_add_task(service, libertine->waitTask());
+
         dbus_test_service_start_tasks(service);
 
         bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
@@ -335,6 +343,7 @@
         //
         // ubuntu::app_launch::Registry::clearDefault();
 
+        libertine.reset();
         g_clear_object(&mock);
         g_clear_object(&cgmock);
         g_clear_object(&service);

=== modified file 'tests/libual-test.cc'
--- tests/libual-test.cc	2017-01-11 23:48:12 +0000
+++ tests/libual-test.cc	2017-02-15 15:03:59 +0000
@@ -30,6 +30,7 @@
 #include "registry.h"
 #include "ubuntu-app-launch.h"
 
+#include "libertine-service.h"
 #include "eventually-fixture.h"
 #include "mir-mock.h"
 
@@ -39,6 +40,7 @@
 		DbusTestService * service = NULL;
 		DbusTestDbusMock * mock = NULL;
 		DbusTestDbusMock * cgmock = NULL;
+		std::shared_ptr<LibertineService> libertine;
 		GDBusConnection * bus = NULL;
 		std::string last_focus_appid;
 		std::string last_resume_appid;
@@ -280,6 +282,12 @@
 			/* Put it together */
 			dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
 			dbus_test_service_add_task(service, DBUS_TEST_TASK(cgmock));
+
+			/* Add in Libertine */
+			libertine = std::make_shared<LibertineService>();
+			dbus_test_service_add_task(service, *libertine);
+			dbus_test_service_add_task(service, libertine->waitTask());
+
 			dbus_test_service_start_tasks(service);
 
 			bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
@@ -299,6 +307,7 @@
 
 			ubuntu::app_launch::Registry::clearDefault();
 
+			libertine.reset();
 			g_clear_object(&mock);
 			g_clear_object(&cgmock);
 			g_clear_object(&service);

=== modified file 'tests/list-apps.cpp'
--- tests/list-apps.cpp	2017-01-31 23:45:21 +0000
+++ tests/list-apps.cpp	2017-02-15 15:03:59 +0000
@@ -23,6 +23,7 @@
 #include <numeric>
 
 #include "eventually-fixture.h"
+#include "libertine-service.h"
 
 #include "application-impl-click.h"
 #include "application-impl-legacy.h"
@@ -39,8 +40,9 @@
 class ListApps : public EventuallyFixture
 {
 protected:
-    GTestDBus* testbus = nullptr;
+    DbusTestService* service = nullptr;
     GDBusConnection* bus = nullptr;
+    std::shared_ptr<LibertineService> libertine;
 
     virtual void SetUp()
     {
@@ -67,8 +69,13 @@
         g_setenv("UBUNTU_APP_LAUNCH_DISABLE_SNAPD_TIMEOUT", "You betcha!", TRUE);
 #endif
 
-        testbus = g_test_dbus_new(G_TEST_DBUS_NONE);
-        g_test_dbus_up(testbus);
+        service = dbus_test_service_new(nullptr);
+
+        libertine = std::make_shared<LibertineService>();
+        dbus_test_service_add_task(service, *libertine);
+        dbus_test_service_add_task(service, libertine->waitTask());
+
+        dbus_test_service_start_tasks(service);
 
         bus = g_bus_get_sync(G_BUS_TYPE_SESSION, nullptr, nullptr);
         g_dbus_connection_set_exit_on_close(bus, FALSE);
@@ -81,11 +88,10 @@
         g_unlink(SNAPD_LIST_APPS_SOCKET);
 #endif
 
+        libertine.reset();
+        g_clear_object(&service);
+
         g_object_unref(bus);
-
-        g_test_dbus_down(testbus);
-        g_clear_object(&testbus);
-
         ASSERT_EVENTUALLY_EQ(nullptr, bus);
     }