Merge lp:~ted/url-dispatcher/bad-url-fixes into lp:url-dispatcher

[Ted Gould]

Update bad-url exec tool to UAL C++ interface

This doesn't fix the bad url support but cleans up some cruft and removes a test that we don't want to port to systemd.

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

FAILED: Continuous integration, rev:117
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/54/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1800/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1807
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1583/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1583/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1583/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1583/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1583/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1583/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/54/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Needs Information

[lp:~ted/url-dispatcher/bad-url-fixes]

118. By Ted Gould on 2017-03-17

Make return values clearer

[Ted Gould (ted)]

We don't need dbus anymore. The URLs are taken care of by UAL. But the return codes should be explicit. Fixed that in r118.

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

FAILED: Continuous integration, rev:118
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/55/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1820/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1827
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1603/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1603/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1603/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1603/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1603/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1603/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/55/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/url-dispatcher/bad-url-fixes]

119. By Ted Gould on 2017-03-17

Turn UAL up to 11

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

FAILED: Continuous integration, rev:119
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/57/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1823/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1830
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1606/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1606/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1606/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1606/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1606/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1606/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/57/rebuild

review: Needs Fixing (continuous-integration)

[lp:~ted/url-dispatcher/bad-url-fixes]

120. By Ted Gould on 2017-03-17

Remove tabs for dobey

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

FAILED: Continuous integration, rev:120
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/58/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1824/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1831
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1607/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1607/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1607/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1607/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1607/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1607/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-url-dispatcher-ci/58/rebuild

review: Needs Fixing (continuous-integration)

[dobey (dobey)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2017-03-14 14:34:06 +0000
+++ debian/control	2017-03-17 15:13:13 +0000
@@ -19,7 +19,7 @@
                libglib2.0-dev,
                libjson-glib-dev,
                libsqlite3-dev,
-               libubuntu-app-launch3-dev (>= 0.5),
+               libubuntu-app-launch3-dev (>= 0.11),
                libunity-scopes-dev,
                python3:any,
                python3-dbusmock <!cross>,

=== modified file 'gui/url-dispatcher-gui.desktop.in'
--- gui/url-dispatcher-gui.desktop.in	2016-08-17 22:13:32 +0000
+++ gui/url-dispatcher-gui.desktop.in	2017-03-17 15:13:13 +0000
@@ -4,3 +4,4 @@
 Type=Application
 Exec=qmlscene @CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/url-dispatcher/gui/url-dispatcher-gui.qml
 X-Ubuntu-Touch=true
+X-Ubuntu-Single-Instance=true

=== modified file 'gui/url-dispatcher-gui.svg'
--- gui/url-dispatcher-gui.svg	2016-08-17 22:00:22 +0000
+++ gui/url-dispatcher-gui.svg	2017-03-17 15:13:13 +0000
@@ -51,6 +51,7 @@
       </cc:Work>
     </rdf:RDF>
   </metadata>
+  <rect x="0" y="0" width="100%" height="100%" style="fill:#ffffff;fill-opacity:1;stroke:none" />
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"

=== modified file 'service/bad-url/CMakeLists.txt'
--- service/bad-url/CMakeLists.txt	2015-06-19 22:02:33 +0000
+++ service/bad-url/CMakeLists.txt	2017-03-17 15:13:13 +0000
@@ -3,7 +3,7 @@
 ###########################
 
 add_definitions( -DQML_BAD_URL="${CMAKE_INSTALL_FULL_DATADIR}/url-dispatcher/bad-url.qml" )
-add_executable(bad-url-exec-tool exec-tool.c)
+add_executable(bad-url-exec-tool exec-tool.cpp)
 set_target_properties(bad-url-exec-tool PROPERTIES OUTPUT_NAME "exec-tool")
 target_link_libraries(bad-url-exec-tool ${GIO2_LIBRARIES} ${UBUNTU_APP_LAUNCH_LIBRARIES})
 

=== renamed file 'service/bad-url/exec-tool.c' => 'service/bad-url/exec-tool.cpp'
--- service/bad-url/exec-tool.c	2015-06-19 22:02:33 +0000
+++ service/bad-url/exec-tool.cpp	2017-03-17 15:13:13 +0000
@@ -17,26 +17,20 @@
  *   Ted Gould <[e-mail]>
  */
 
-#include <gio/gio.h>
-#include <ubuntu-app-launch.h>
+#include <ubuntu-app-launch/helper.h>
+#include <glib.h>
 
 int
 main (int argc, char * argv[])
 {
-	GDBusConnection * bus = g_bus_get_sync(G_BUS_TYPE_SESSION, NULL, NULL);
-	g_return_val_if_fail(bus != NULL, -1);
-
-	gchar * exec = g_strdup_printf("qmlscene %s %s", QML_BAD_URL, g_getenv("APP_URIS"));
-
-	gboolean sended = ubuntu_app_launch_helper_set_exec(exec, NULL);
-	g_free(exec);
-
-	/* Ensuring the messages get on the bus before we quit */
-	g_dbus_connection_flush_sync(bus, NULL, NULL);
-	g_clear_object(&bus);
-
-	if (sended)
-		return 0;
-	else
-		return -1;
+    try {
+        ubuntu::app_launch::Helper::setExec({"qmlscene", QML_BAD_URL});
+        return EXIT_SUCCESS;
+    } catch (std::runtime_error &e) {
+        g_warning("Unable to set helper: %s", e.what());
+        return EXIT_FAILURE;
+    } catch (...) {
+        g_warning("Unknown failure setting exec line");
+        return EXIT_FAILURE;
+    }
 }

=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2017-03-14 14:31:35 +0000
+++ tests/CMakeLists.txt	2017-03-17 15:13:13 +0000
@@ -118,19 +118,6 @@
 add_subdirectory(url_dispatcher_testability)
 
 ###########################
-# exec tool test
-###########################
-
-add_executable (exec-tool-test exec-tool-test.cc)
-target_link_libraries (exec-tool-test
-	gtest
-	${GMOCK_LIBRARIES}
-	${GIO2_LIBRARIES}
-	${DBUSTEST_LIBRARIES})
-
-add_test (exec-tool-test exec-tool-test)
-
-###########################
 # overlay tracker test
 ###########################
 

=== removed file 'tests/exec-tool-test.cc'
--- tests/exec-tool-test.cc	2017-03-10 23:54:46 +0000
+++ tests/exec-tool-test.cc	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-/**
- * Copyright © 2013-2015 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "test-config.h"
-
-#include <gio/gio.h>
-#include <gtest/gtest.h>
-#include <libdbustest/dbus-test.h>
-
-class ExecToolTest : public ::testing::Test
-{
-	protected:
-		DbusTestService * service = nullptr;
-		DbusTestDbusMock * mock = nullptr;
-		DbusTestDbusMockObject * obj = nullptr;
-		GDBusConnection * bus = nullptr;
-
-		virtual void SetUp() {
-			g_setenv("URL_DISPATCHER_DISABLE_RECOVERABLE_ERROR", "1", TRUE);
-			g_setenv("URL_DISPATCHER_OVERLAY_DIR", OVERLAY_TEST_DIR, TRUE);
-
-			service = dbus_test_service_new(nullptr);
-
-			/* Upstart Mock */
-			mock = dbus_test_dbus_mock_new("com.ubuntu.Upstart");
-			obj = dbus_test_dbus_mock_get_object(mock, "/com/ubuntu/Upstart", "com.ubuntu.Upstart0_6", nullptr);
-
-			dbus_test_dbus_mock_object_add_method(mock, obj,
-				"SetEnv",
-				G_VARIANT_TYPE("(assb)"),
-				NULL,
-				"",
-				NULL);
-
-			dbus_test_task_set_name(DBUS_TEST_TASK(mock), "Upstart");
-			dbus_test_service_add_task(service, DBUS_TEST_TASK(mock));
-
-			/* Start your engines! */
-			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);
-			g_object_add_weak_pointer(G_OBJECT(bus), (gpointer *)&bus);
-			return;
-		}
-
-		virtual void TearDown() {
-			/* dbustest should probably do this, not sure */
-
-			g_clear_object(&mock);
-			g_clear_object(&service);
-
-			g_object_unref(bus);
-
-			unsigned int cleartry = 0;
-			while (bus != nullptr && cleartry < 100) {
-				pause(100);
-				cleartry++;
-			}
-
-			return;
-		}
-		
-		static gboolean quit_loop (gpointer ploop) {
-			g_main_loop_quit((GMainLoop *)ploop);
-			return FALSE;
-		}
-
-		void pause (int time) {
-			GMainLoop * loop = g_main_loop_new(nullptr, FALSE);
-			g_timeout_add(time, quit_loop, loop);
-			g_main_loop_run(loop);
-			g_main_loop_unref(loop);
-		}
-};
-
-TEST_F(ExecToolTest, SetOverlay)
-{
-	g_unsetenv("APP_ID");
-	gint retval = 0;
-	EXPECT_TRUE(g_spawn_command_line_sync(EXEC_TOOL, nullptr, nullptr, &retval, nullptr));
-	EXPECT_NE(0, retval);
-
-	g_setenv("APP_ID", "com.test.good_application_1.2.3", TRUE);
-	g_setenv("UPSTART_JOB", "fubar", TRUE);
-	EXPECT_TRUE(g_spawn_command_line_sync(EXEC_TOOL, nullptr, nullptr, &retval, nullptr));
-	EXPECT_EQ(0, retval);
-
-	guint len = 0;
-	const DbusTestDbusMockCall * calls = dbus_test_dbus_mock_object_get_method_calls(mock, obj, "SetEnv", &len, NULL);
-	ASSERT_NE(nullptr, calls);
-	ASSERT_EQ(1, len);
-
-	GVariant * appexecenv = g_variant_get_child_value(calls[0].params, 1);
-	EXPECT_STREQ("APP_EXEC=foobar", g_variant_get_string(appexecenv, nullptr));
-	g_variant_unref(appexecenv);
-}