Merge lp:~mandel/ubuntu-download-manager/single-daemon into lp:ubuntu-download-manager

[Manuel de la Peña]

Ensure that a single instance of the daemon can be ran.

Ensure that a single instance of the daemon can be ran.

[lp:~mandel/ubuntu-download-manager/single-daemon]

100. By Manuel de la Peña on 2013-08-21

Fixed broken tests.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:99
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/18/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/18/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/18/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:100
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/19/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-amd64-ci/19
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-saucy-armhf-ci/10

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-download-manager-ci/19/rebuild

review: Approve (continuous-integration)

[Diego Sarmentero (diegosarmentero)]

+1

review: Approve

[Alejandro J. Cura (alecu)]

plus one

review: Approve

=== added file 'libubuntudownloadmanager/application.cpp'
--- libubuntudownloadmanager/application.cpp	1970-01-01 00:00:00 +0000
+++ libubuntudownloadmanager/application.cpp	2013-08-21 12:22:01 +0000
@@ -0,0 +1,65 @@
+/*
+ * Copyright 2013 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 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 Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include <QDebug>
+#include <QCoreApplication>
+#include "./application.h"
+
+/*
+ * PRIVATE IMPLEMENTATION
+ */
+
+class ApplicationPrivate {
+    Q_DECLARE_PUBLIC(Application)
+
+ public:
+    explicit ApplicationPrivate(Application* parent);
+
+    virtual void exit(int returnCode);
+
+ private:
+    Application* q_ptr;
+};
+
+ApplicationPrivate::ApplicationPrivate(Application* parent)
+    : q_ptr(parent) {
+}
+
+void
+ApplicationPrivate::exit(int returnCode) {
+    // get the application instance and exit
+    QCoreApplication* app = QCoreApplication::instance();
+    app->exit(returnCode);
+}
+
+/*
+ * PUBLIC IMPLEMENTATION
+ */
+
+
+Application::Application(QObject *parent)
+    : QObject(parent),
+      d_ptr(new ApplicationPrivate(this)) {
+}
+
+void
+Application::exit(int returnCode) {
+    Q_D(Application);
+    qDebug() << "Exit app" << returnCode;
+    d->exit(returnCode);
+}

=== added file 'libubuntudownloadmanager/application.h'
--- libubuntudownloadmanager/application.h	1970-01-01 00:00:00 +0000
+++ libubuntudownloadmanager/application.h	2013-08-21 12:22:01 +0000
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2013 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 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 Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef DOWNLOADER_LIB_APPLICATION_H
+#define DOWNLOADER_LIB_APPLICATION_H
+
+#include <QObject>
+
+class ApplicationPrivate;
+class Application : public QObject {
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(Application)
+
+ public:
+    explicit Application(QObject *parent = 0);
+
+    virtual void exit(int returnCode = 0);
+
+ private:
+    // use pimpl so that we can mantains ABI compatibility
+    ApplicationPrivate* d_ptr;
+};
+
+#endif  // DOWNLOADER_LIB_APPLICATION_H

=== modified file 'libubuntudownloadmanager/download_daemon.cpp'
--- libubuntudownloadmanager/download_daemon.cpp	2013-08-12 14:11:21 +0000
+++ libubuntudownloadmanager/download_daemon.cpp	2013-08-21 12:22:01 +0000
@@ -19,6 +19,7 @@
 #include <QtDBus/QDBusConnection>
 #include <QDebug>
 #include <QSharedPointer>
+#include "./application.h"
 #include "./logger.h"
 #include "./download_manager.h"
 #include "./download_manager_adaptor.h"
@@ -33,16 +34,18 @@
 
  public:
     explicit DownloadDaemonPrivate(DownloadDaemon* parent);
-    explicit DownloadDaemonPrivate(DBusConnection* conn,
+    explicit DownloadDaemonPrivate(Application* app,
+                                   DBusConnection* conn,
                                    DownloadDaemon* parent);
     ~DownloadDaemonPrivate();
 
-    bool start();
+    void start();
 
  private:
     void init();
 
  private:
+    Application* _app;
     QSharedPointer<DBusConnection> _conn;
     DownloadManager* _downInterface;
     DownloadManagerAdaptor* _downAdaptor;
@@ -51,14 +54,17 @@
 
 DownloadDaemonPrivate::DownloadDaemonPrivate(DownloadDaemon* parent)
     : q_ptr(parent) {
+    _app = new Application();
     _conn = QSharedPointer<DBusConnection>(new DBusConnection());
     _downInterface = new DownloadManager(_conn, q_ptr);
     init();
 }
 
-DownloadDaemonPrivate::DownloadDaemonPrivate(DBusConnection* conn,
+DownloadDaemonPrivate::DownloadDaemonPrivate(Application* app,
+                                             DBusConnection* conn,
                                              DownloadDaemon* parent)
-    : _conn(conn),
+    : _app(app),
+      _conn(conn),
       q_ptr(parent) {
       _downInterface = new DownloadManager(_conn);
     init();
@@ -79,12 +85,14 @@
     // no need to delete the adaptor because the interface is its parent
     if (_downInterface)
         delete _downInterface;
+    if (_app)
+        delete _app;
 
     // stop logging
     Logger::setupLogging();
 }
 
-bool
+void
 DownloadDaemonPrivate::start() {
     qDebug() << "Starting daemon";
     _downAdaptor = new DownloadManagerAdaptor(_downInterface);
@@ -94,10 +102,14 @@
             << "com.canonical.applications.Downloader";
         ret = _conn->registerObject("/", _downInterface);
         qDebug() << ret;
-        return ret;
+        if (!ret) {
+            qDebug() << "Could not register interface";
+            _app->exit(-1);
+        }
+        return;
     }
-    qDebug() << "Could not register";
-    return false;
+    qDebug() << "Could not register service";
+    _app->exit(-1);
 }
 
 /**
@@ -109,13 +121,15 @@
       d_ptr(new DownloadDaemonPrivate(this)) {
 }
 
-DownloadDaemon::DownloadDaemon(DBusConnection* conn, QObject *parent)
+DownloadDaemon::DownloadDaemon(Application* app,
+                               DBusConnection* conn,
+                               QObject *parent)
     : QObject(parent),
-      d_ptr(new DownloadDaemonPrivate(conn, this)) {
+      d_ptr(new DownloadDaemonPrivate(app, conn, this)) {
 }
 
-bool
+void
 DownloadDaemon::start() {
     Q_D(DownloadDaemon);
-    return d->start();
+    d->start();
 }

=== modified file 'libubuntudownloadmanager/download_daemon.h'
--- libubuntudownloadmanager/download_daemon.h	2013-07-23 14:39:41 +0000
+++ libubuntudownloadmanager/download_daemon.h	2013-08-21 12:22:01 +0000
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include "./app-downloader-lib_global.h"
+#include "./application.h"
 #include "./dbus_connection.h"
 
 class DownloadDaemonPrivate;
@@ -30,9 +31,12 @@
 
  public:
     explicit DownloadDaemon(QObject *parent = 0);
-    explicit DownloadDaemon(DBusConnection* conn, QObject *parent = 0);
+    explicit DownloadDaemon(Application* app,
+                            DBusConnection* conn,
+                            QObject *parent = 0);
 
-    bool start();
+ public slots:
+    void start();
 
  private:
     // use pimpl so that we can mantains ABI compatibility

=== modified file 'libubuntudownloadmanager/libubuntudownloadmanager.pro'
--- libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-07-26 15:50:37 +0000
+++ libubuntudownloadmanager/libubuntudownloadmanager.pro	2013-08-21 12:22:01 +0000
@@ -23,7 +23,8 @@
     xdg_basedir.cpp \
     process.cpp \
     process_factory.cpp \
-    logger.cpp
+    logger.cpp \
+    application.cpp
 
 HEADERS +=\
     app-downloader-lib_global.h \
@@ -42,7 +43,8 @@
     process.h \
     process_factory.h \
     metatypes.h \
-    logger.h
+    logger.h \
+    application.h
 
 OTHER_FILES += \
     generate_adaptors.sh \

=== modified file 'ubuntu-download-manager-tests/fake.cpp'
--- ubuntu-download-manager-tests/fake.cpp	2013-07-23 16:29:36 +0000
+++ ubuntu-download-manager-tests/fake.cpp	2013-08-21 12:22:01 +0000
@@ -79,6 +79,26 @@
 }
 
 /*
+ * INT WRAPPER
+ */
+
+IntWrapper::IntWrapper(int value, QObject* parent)
+    : QObject(parent),
+      _value(value) {
+}
+
+
+int
+IntWrapper::value() {
+    return _value;
+}
+
+void
+IntWrapper::setValue(int value) {
+    _value = value;
+}
+
+/*
  * UINT WRAPPER
  */
 

=== modified file 'ubuntu-download-manager-tests/fake.h'
--- ubuntu-download-manager-tests/fake.h	2013-07-23 17:45:38 +0000
+++ ubuntu-download-manager-tests/fake.h	2013-08-21 12:22:01 +0000
@@ -66,6 +66,19 @@
     QStringList _value;
 };
 
+class IntWrapper : public QObject {
+    Q_OBJECT
+
+ public:
+    IntWrapper(int value, QObject* parent = 0);
+
+    int value();
+    void setValue(int value);
+
+ private:
+    int _value;
+};
+
 class UintWrapper : public QObject {
     Q_OBJECT
 

=== added file 'ubuntu-download-manager-tests/fake_application.cpp'
--- ubuntu-download-manager-tests/fake_application.cpp	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_application.cpp	2013-08-21 12:22:01 +0000
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2013 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 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 Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#include "fake_application.h"
+
+FakeApplication::FakeApplication(QObject *parent)
+    : Application(parent),
+    Fake() {
+}
+
+void
+FakeApplication::exit(int returnCode) {
+    if (_recording) {
+        QList<QObject*> inParams;
+        inParams.append(new IntWrapper(returnCode));
+
+        QList<QObject*> outParams;
+        MethodParams params(inParams, outParams);
+        MethodData methodData("exit", params);
+        _called.append(methodData);
+    }
+}

=== added file 'ubuntu-download-manager-tests/fake_application.h'
--- ubuntu-download-manager-tests/fake_application.h	1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/fake_application.h	2013-08-21 12:22:01 +0000
@@ -0,0 +1,35 @@
+/*
+ * Copyright 2013 2013 Canonical Ltd.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of version 3 of the GNU Lesser General Public
+ * License 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 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 Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef FAKE_APPLICATION_H
+#define FAKE_APPLICATION_H
+
+#include <QObject>
+#include <application.h>
+#include "./fake.h"
+
+class FakeApplication : public Application, public Fake {
+    Q_OBJECT
+
+ public:
+    explicit FakeApplication(QObject *parent = 0);
+
+    void exit(int returnCode = 0) override;
+};
+
+#endif  // FAKE_APPLICATION_H

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.cpp'
--- ubuntu-download-manager-tests/test_download_daemon.cpp	2013-07-24 13:56:44 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.cpp	2013-08-21 12:22:01 +0000
@@ -24,12 +24,15 @@
 
 void
 TestDownloadDaemon::init() {
+    _app = new FakeApplication();
     _conn = new FakeDBusConnection();
-    _daemon = new DownloadDaemon(_conn);
+    _daemon = new DownloadDaemon(_app, _conn, this);
 }
 
 void
 TestDownloadDaemon::cleanup() {
+    if (_app != NULL)
+        delete _app;
     if (_conn != NULL)
         delete _conn;
     if (_daemon != NULL)
@@ -41,14 +44,19 @@
     _conn->setRegisterServiceResult(true);
     _conn->setRegisterObjectResult(true);
     _conn->record();
+    _app->record();
 
-    QVERIFY(_daemon->start());
+    _daemon->start();
 
     QList<MethodData> calledMethods = _conn->calledMethods();
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
+
+    // assert exit was NOT called
+    calledMethods = _app->calledMethods();
+    QCOMPARE(0, calledMethods.count());
 }
 
 void
@@ -56,13 +64,19 @@
     _conn->setRegisterServiceResult(false);
     _conn->setRegisterObjectResult(true);
     _conn->record();
+    _app->record();
 
-    QVERIFY(!_daemon->start());
+    _daemon->start();
 
     QList<MethodData> calledMethods = _conn->calledMethods();
 
     QCOMPARE(1, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
+
+    // assert exit was called
+    calledMethods = _app->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    QCOMPARE(QString("exit"), calledMethods[0].methodName());
 }
 
 void
@@ -70,12 +84,18 @@
     _conn->setRegisterServiceResult(true);
     _conn->setRegisterObjectResult(false);
     _conn->record();
+    _app->record();
 
-    QVERIFY(!_daemon->start());
+    _daemon->start();
 
     QList<MethodData> calledMethods = _conn->calledMethods();
 
     QCOMPARE(2, calledMethods.count());
     QCOMPARE(QString("registerService"), calledMethods[0].methodName());
     QCOMPARE(QString("registerObject"), calledMethods[1].methodName());
+
+    // assert exit was called
+    calledMethods = _app->calledMethods();
+    QCOMPARE(1, calledMethods.count());
+    QCOMPARE(QString("exit"), calledMethods[0].methodName());
 }

=== modified file 'ubuntu-download-manager-tests/test_download_daemon.h'
--- ubuntu-download-manager-tests/test_download_daemon.h	2013-07-24 13:58:02 +0000
+++ ubuntu-download-manager-tests/test_download_daemon.h	2013-08-21 12:22:01 +0000
@@ -21,6 +21,7 @@
 
 #include <QObject>
 #include <download_daemon.h>
+#include "./fake_application.h"
 #include "./fake_dbus_connection.h"
 #include "./test_runner.h"
 
@@ -39,6 +40,7 @@
     void testStartFailObjectRegister();
 
  private:
+    FakeApplication* _app;
     FakeDBusConnection* _conn;
     DownloadDaemon* _daemon;
 };

=== modified file 'ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro'
--- ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-07-21 14:30:42 +0000
+++ ubuntu-download-manager-tests/ubuntu-download-manager-tests.pro	2013-08-21 12:22:01 +0000
@@ -31,7 +31,8 @@
     fake_uuid_factory.cpp \
     fake_system_network_info.cpp \
     fake_process.cpp \
-    fake_process_factory.cpp
+    fake_process_factory.cpp \
+    fake_application.cpp
 
 HEADERS += \
     fake.h \
@@ -51,7 +52,8 @@
     fake_uuid_factory.h \
     fake_system_network_info.h \
     fake_process.h \
-    fake_process_factory.h
+    fake_process_factory.h \
+    fake_application.h
 
 LIBS += -L$$OUT_PWD/../libubuntudownloadmanager/ -lubuntudownloadmanager
 

=== modified file 'ubuntu-download-manager/main.cpp'
--- ubuntu-download-manager/main.cpp	2013-07-23 16:23:40 +0000
+++ ubuntu-download-manager/main.cpp	2013-08-21 12:22:01 +0000
@@ -16,15 +16,16 @@
  * Boston, MA 02110-1301, USA.
  */
 
+#include <QTimer>
 #include <QCoreApplication>
 #include <download_daemon.h>
 
 int main(int argc, char *argv[]) {
     QCoreApplication a(argc, argv);
 
-    // TODO(mandel): deal with the fact that we might be already running
     DownloadDaemon* daemon = new DownloadDaemon();
-    daemon->start();
+    // use a singleShot timer so that we start after exec so that exit works
+    QTimer::singleShot(0, daemon, SLOT(start()));
 
     return a.exec();
 }