Merge lp:~ken-vandine/content-hub/lp1324969 into lp:content-hub

[Ken VanDine]

Add a wrapper for the click hook to ensure the dbus session is properly
exported (LP: #1324969)

Add a wrapper for the click hook to ensure the dbus session is properly
exported (LP: #1324969)

[Ken VanDine (ken-vandine)]

Are there any related MPs required for this MP to build/function as expected? Please list.

 * No

Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)

 * Yes

Did you perform an exploratory manual test run of your code change and any related functionality on device or emulator?

 * Yes

Did you successfully run all tests found in your component's Test Plan (https://wiki.ubuntu.com/Process/Merges/TestPlan/content-hub) on device or emulator?

 * Yes

If you changed the UI, was the change specified/approved by design?

 * No change

If you changed the packaging (debian), did you subscribe a core-dev to this MP?

 * No change

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:103
http://jenkins.qa.ubuntu.com/job/content-hub-ci/159/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/16
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/16
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/16/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/16

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/159/rebuild

review: Approve (continuous-integration)

[lp:~ken-vandine/content-hub/lp1324969]

104. By Ken VanDine on 2014-06-03

ensure we delete the Hook and Registry to make sure the QGSettings destructor
gets called.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:104
http://jenkins.qa.ubuntu.com/job/content-hub-ci/160/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-amd64-ci/17
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/17
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-armhf-ci/17/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-utopic-i386-ci/17

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/content-hub-ci/160/rebuild

review: Approve (continuous-integration)

[Michael Sheldon (michael-sheldon)]

I'm testing by bumping the version of hub-importer and reinstalling multiple times. It seems to work correctly if content-hub-service isn't running when it's installed, however if content-hub-service is running the click is installed the importer old version gets removed from gsettings but the new version isn't added.

review: Needs Fixing

[Michael Sheldon (michael-sheldon)]

Sorry, that should read:

however if content-hub-service is running when the click is installed, the old version gets removed from gsettings but the new version isn't added.

[Ken VanDine (ken-vandine)]

> Sorry, that should read:
>
> however if content-hub-service is running when the click is installed, the old
> version gets removed from gsettings but the new version isn't added.

That's a bug in gsettings-qt, it wasn't calling g_settings_sync in the destructor. Fixed in https://code.launchpad.net/~larsu/gsettings-qt/sync-on-destroy/+merge/221895

[Michael Sheldon (michael-sheldon)]

Did you perform an exploratory manual test run of the code change and any related functionality on device or emulator?

 * Yes (except for occasional failure due to QGSettings bug)

Did CI run pass? If not, please explain why.

 * Yes

Have you checked that submitter has accurately filled out the submitter checklist and has taken no shortcut?

 * Yes

review: Approve

=== modified file 'debian/content-hub.install'
--- debian/content-hub.install	2014-03-07 19:28:54 +0000
+++ debian/content-hub.install	2014-06-03 14:07:13 +0000
@@ -1,5 +1,5 @@
 usr/bin
-usr/lib/*/content-hub/content-hub-peer-hook
+usr/lib/*/content-hub
 usr/share/click/hooks
 usr/share/dbus-1
 usr/share/glib-2.0/schemas

=== modified file 'src/com/ubuntu/content/service/CMakeLists.txt'
--- src/com/ubuntu/content/service/CMakeLists.txt	2014-03-07 21:07:27 +0000
+++ src/com/ubuntu/content/service/CMakeLists.txt	2014-06-03 14:07:13 +0000
@@ -80,6 +80,16 @@
   ${UPSTART_LAUNCH_LDFLAGS}
 )
 
+configure_file("content-hub-peer-hook-wrapper.in"
+  "content-hub-peer-hook-wrapper"
+  @ONLY
+)
+
+install(
+  PROGRAMS "${CMAKE_CURRENT_BINARY_DIR}/content-hub-peer-hook-wrapper"
+  DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/content-hub"
+)
+
 install(
   TARGETS content-hub-peer-hook
   RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_LIBEXECDIR}/content-hub"

=== added file 'src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in'
--- src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	1970-01-01 00:00:00 +0000
+++ src/com/ubuntu/content/service/content-hub-peer-hook-wrapper.in	2014-06-03 14:07:13 +0000
@@ -0,0 +1,8 @@
+#!/bin/sh 
+
+if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then
+  [ -e $HOME/.cache/upstart/dbus-session ] && . $HOME/.cache/upstart/dbus-session || eval `dbus-launch --sh-syntax`
+  [ -n "$DBUS_SESSION_BUS_ADDRESS" ] && export DBUS_SESSION_BUS_ADDRESS
+fi
+
+@pkglibexecdir@/content-hub/content-hub-peer-hook

=== modified file 'src/com/ubuntu/content/service/content-hub.hook.in'
--- src/com/ubuntu/content/service/content-hub.hook.in	2013-09-23 20:55:01 +0000
+++ src/com/ubuntu/content/service/content-hub.hook.in	2014-06-03 14:07:13 +0000
@@ -1,4 +1,4 @@
 Pattern: ${home}/.local/share/content-hub/${id}
-Exec: @pkglibexecdir@/content-hub/content-hub-peer-hook
+Exec: @pkglibexecdir@/content-hub/content-hub-peer-hook-wrapper
 User-Level: yes
 Hook-Name: content-hub

=== modified file 'src/com/ubuntu/content/service/hook.cpp'
--- src/com/ubuntu/content/service/hook.cpp	2014-03-04 21:47:48 +0000
+++ src/com/ubuntu/content/service/hook.cpp	2014-06-03 14:07:13 +0000
@@ -43,6 +43,12 @@
 {
 }
 
+cucd::Hook::~Hook()
+{
+    TRACE() << Q_FUNC_INFO;
+    delete registry;
+}
+
 void cucd::Hook::run()
 {
     TRACE() << Q_FUNC_INFO;
@@ -85,6 +91,7 @@
     Q_FOREACH(QFileInfo f, contentDir.entryInfoList(QDir::Files))
         add_peer(f);
 
+    deleteLater();
     QCoreApplication::instance()->quit();
 }
 

=== modified file 'src/com/ubuntu/content/service/hook.h'
--- src/com/ubuntu/content/service/hook.h	2014-02-20 21:18:27 +0000
+++ src/com/ubuntu/content/service/hook.h	2014-06-03 14:07:13 +0000
@@ -39,6 +39,7 @@
 public:
     explicit Hook(QObject *parent = 0);
     Hook(com::ubuntu::content::detail::PeerRegistry *registry, QObject *parent = 0);
+    ~Hook();
 
 public slots:
     bool return_error(QString err = "");

=== modified file 'src/com/ubuntu/content/service/registry.cpp'
--- src/com/ubuntu/content/service/registry.cpp	2014-04-02 14:46:23 +0000
+++ src/com/ubuntu/content/service/registry.cpp	2014-06-03 14:07:13 +0000
@@ -71,7 +71,10 @@
     }
 }
 
-Registry::~Registry() {}
+Registry::~Registry()
+{
+    TRACE() << Q_FUNC_INFO;
+}
 
 cuc::Peer Registry::default_source_for_type(cuc::Type type)
 {