ubuntu-download-manager

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

  1. programatically-set-daemon
  2. Merge into trunk
Proposed by Manuel de la Peña
Status: Merged
Approved by: Manuel de la Peña
Approved revision: 171
Merged at revision: 170
Proposed branch: lp:~mandel/ubuntu-download-manager/programatically-set-daemon
Merge into: lp:ubuntu-download-manager
Diff against target: 454 lines (+329/-1)
14 files modified
libubuntudownloadmanager/downloads/daemon.cpp (+60/-0)
libubuntudownloadmanager/downloads/daemon.h (+10/-0)
ubuntu-download-manager-tests/base_testcase.cpp (+12/-1)
ubuntu-download-manager-tests/base_testcase.h (+1/-0)
ubuntu-download-manager-tests/data/bad_cert.pem (+21/-0)
ubuntu-download-manager-tests/data/bad_key.pem (+28/-0)
ubuntu-download-manager-tests/data/cert.pem (+21/-0)
ubuntu-download-manager-tests/data/expired_cert.pem (+21/-0)
ubuntu-download-manager-tests/data/expired_key.pem (+28/-0)
ubuntu-download-manager-tests/data/key.pem (+28/-0)
ubuntu-download-manager-tests/data/nasty_cert.pem (+21/-0)
ubuntu-download-manager-tests/data/nasty_key.pem (+28/-0)
ubuntu-download-manager-tests/downloads/test_daemon.cpp (+45/-0)
ubuntu-download-manager-tests/downloads/test_daemon.h (+5/-0)
To merge this branch: bzr merge lp:~mandel/ubuntu-download-manager/programatically-set-daemon
Reviewer Review Type Date Requested Status
Roberto Alsina (community) Approve
PS Jenkins bot continuous-integration Approve
Diego Sarmentero (community) Approve
Review via email: mp+194556@code.launchpad.net

Commit message

Provide setters and getters for the daemon command line args. Added self signed ssl certs for testing purposes.

Description of the change

Provide setters and getters for the daemon command line args. Added self signed ssl certs for testing purposes.

To post a comment you must log in.
lp:~mandel/ubuntu-download-manager/programatically-set-daemon updated
171. By Manuel de la Peña

Merged with trunk.

Revision history for this message
Diego Sarmentero (diegosarmentero) wrote :

+1

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:171
http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-ci/207/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-amd64-ci/96
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-download-manager-trusty-armhf-ci/96

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/ubuntu-download-manager-ci/207/rebuild

review: Approve (continuous-integration)
Revision history for this message
Roberto Alsina (ralsina) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'libubuntudownloadmanager/downloads/daemon.cpp'
--- libubuntudownloadmanager/downloads/daemon.cpp 2013-11-07 00:04:41 +0000
+++ libubuntudownloadmanager/downloads/daemon.cpp 2013-11-08 17:53:31 +0000
@@ -74,6 +74,30 @@
74 Logger::stopLogging();74 Logger::stopLogging();
75 }75 }
7676
77 bool isTimeoutEnabled() {
78 return _isTimeoutEnabled;
79 }
80
81 void enableTimeout(bool enabled) {
82 _isTimeoutEnabled = enabled;
83 }
84
85 bool isStoppable() {
86 return _stoppable;
87 }
88
89 void setStoppable(bool stoppable) {
90 _stoppable = stoppable;
91 }
92
93 QList<QSslCertificate> selfSignedCerts() {
94 return _certs;
95 }
96
97 void setSelfSignedCerts(QList<QSslCertificate> certs) {
98 _certs = certs;
99 }
100
77 void start(QString path) {101 void start(QString path) {
78 TRACE;102 TRACE;
79 _downAdaptor = new DownloadManagerAdaptor(_downInterface);103 _downAdaptor = new DownloadManagerAdaptor(_downInterface);
@@ -199,6 +223,42 @@
199 d_ptr(new DaemonPrivate(app, conn, timer, man, this)) {223 d_ptr(new DaemonPrivate(app, conn, timer, man, this)) {
200}224}
201225
226bool
227Daemon::isTimeoutEnabled() {
228 Q_D(Daemon);
229 return d->isTimeoutEnabled();
230}
231
232void
233Daemon::enableTimeout(bool enabled) {
234 Q_D(Daemon);
235 d->enableTimeout(enabled);
236}
237
238bool
239Daemon::isStoppable() {
240 Q_D(Daemon);
241 return d->isStoppable();
242}
243
244void
245Daemon::setStoppable(bool stoppable) {
246 Q_D(Daemon);
247 d->setStoppable(stoppable);
248}
249
250QList<QSslCertificate>
251Daemon::selfSignedCerts() {
252 Q_D(Daemon);
253 return d->selfSignedCerts();
254}
255
256void
257Daemon::setSelfSignedCerts(QList<QSslCertificate> certs) {
258 Q_D(Daemon);
259 d->setSelfSignedCerts(certs);
260}
261
202void262void
203Daemon::start(QString path) {263Daemon::start(QString path) {
204 Q_D(Daemon);264 Q_D(Daemon);
205265
=== modified file 'libubuntudownloadmanager/downloads/daemon.h'
--- libubuntudownloadmanager/downloads/daemon.h 2013-11-07 00:04:41 +0000
+++ libubuntudownloadmanager/downloads/daemon.h 2013-11-08 17:53:31 +0000
@@ -20,6 +20,7 @@
20#define DOWNLOADER_LIB_DOWNLOAD_DAEMON_H20#define DOWNLOADER_LIB_DOWNLOAD_DAEMON_H
2121
22#include <QObject>22#include <QObject>
23#include <QSslCertificate>
23#include <QSharedPointer>24#include <QSharedPointer>
24#include "app-downloader-lib_global.h"25#include "app-downloader-lib_global.h"
25#include "downloads/manager.h"26#include "downloads/manager.h"
@@ -44,6 +45,15 @@
44 Manager* man,45 Manager* man,
45 QObject *parent = 0);46 QObject *parent = 0);
4647
48 bool isTimeoutEnabled();
49 void enableTimeout(bool enabled);
50
51 bool isStoppable();
52 void setStoppable(bool stoppable);
53
54 QList<QSslCertificate> selfSignedCerts();
55 void setSelfSignedCerts(QList<QSslCertificate> cert);
56
47 public slots: // NOLINT (whitespace/indent)57 public slots: // NOLINT (whitespace/indent)
48 void start(QString path="com.canonical.applications.Downloader");58 void start(QString path="com.canonical.applications.Downloader");
4959
5060
=== modified file 'ubuntu-download-manager-tests/base_testcase.cpp'
--- ubuntu-download-manager-tests/base_testcase.cpp 2013-09-25 10:30:57 +0000
+++ ubuntu-download-manager-tests/base_testcase.cpp 2013-11-08 17:53:31 +0000
@@ -19,7 +19,8 @@
19#include <QDir>19#include <QDir>
20#include <QtGlobal>20#include <QtGlobal>
21#include <QStandardPaths>21#include <QStandardPaths>
22#include "./base_testcase.h"22#include <string.h>
23#include "base_testcase.h"
2324
24void25void
25noMessageOutput(QtMsgType type,26noMessageOutput(QtMsgType type,
@@ -51,6 +52,16 @@
51 return path;52 return path;
52}53}
5354
55QString
56BaseTestCase::dataDirectory() {
57 // get the file name and use it to get the data path that is in the
58 // same dir
59 QDir dir(".");
60 dir.makeAbsolute();
61
62 return dir.path() + "/data";
63}
64
54bool65bool
55BaseTestCase::removeDir(const QString& dirName) {66BaseTestCase::removeDir(const QString& dirName) {
56 bool result = true;67 bool result = true;
5768
=== modified file 'ubuntu-download-manager-tests/base_testcase.h'
--- ubuntu-download-manager-tests/base_testcase.h 2013-09-25 10:30:57 +0000
+++ ubuntu-download-manager-tests/base_testcase.h 2013-11-08 17:53:31 +0000
@@ -28,6 +28,7 @@
28 BaseTestCase(const QString& testName, QObject *parent = 0);28 BaseTestCase(const QString& testName, QObject *parent = 0);
29 29
30 QString testDirectory();30 QString testDirectory();
31 QString dataDirectory();
3132
32 protected slots: // NOLINT(whitespace/indent)33 protected slots: // NOLINT(whitespace/indent)
3334
3435
=== added directory 'ubuntu-download-manager-tests/data'
=== added file 'ubuntu-download-manager-tests/data/bad_cert.pem'
--- ubuntu-download-manager-tests/data/bad_cert.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/bad_cert.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
1-----BEGIN CERTIFICATE-----
2MIIDezCCAmOgAwIBAgIJAPQ/j6faumV6MA0GCSqGSIb3DQEBBQUAMFQxCzAJBgNV
3BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMRwwGgYDVQQKDBNJbWFnZSBCYXNl
4ZCBVcGRhdGVzMRIwEAYDVQQDDAlsb2NhbGhvc3QwHhcNMTMwNTEzMjIwODExWhcN
5MjMwNTExMjIwODExWjBUMQswCQYDVQQGEwJVUzETMBEGA1UECAwKU29tZS1TdGF0
6ZTEcMBoGA1UECgwTSW1hZ2UgQmFzZWQgVXBkYXRlczESMBAGA1UEAwwJbG9jYWxo
7b3N0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2w8OthblYYtvnxTk
8+yiaK/z96/YT3DWuwnrxu5LozowkXlp83MXKXAAs7xRDdXLKl5UYeosC1Qh7oPOz
934T2ukMeA1JwuXb88OvfKSxmPnoRJw+J067hwy0hf/eKnclKIaPMJshmUCL8DXum
10C+Ss4yg/+q0xSp/uZwzOZWvgQLhLjIZ0UVE3gPmtaQ97MjnVmYF5frVkUaeE5ggn
11x36JBw6yxIFlzXMPtxnPGDf1X4KyUEYR6dKdfKV+rNEKl+keHUmiG5gmtuBPBhH7
12Q8nVGzUVV9erCJ3JcdKd5XW/f3p9nYc4yjKQ9f01GfSmkODStcpCZzQhRlicWLBM
13LZ3m3wIDAQABo1AwTjAdBgNVHQ4EFgQUWNYFPW/h1vsiUtc7EpSqh8sfrpowHwYD
14VR0jBBgwFoAUWNYFPW/h1vsiUtc7EpSqh8sfrpowDAYDVR0TBAUwAwEB/zANBgkq
15hkiG9w0BAQUFAAOCAQEAbwbWBubZxS/D9VGfbOnZ9z/ZvqREZ6TD8wPfDywGUdHP
16W036tMSZM9ORRvPmbHTRRspiASH66zfh3e3k0i0dT9JJnbxpsgLw/GnomwbrvqEX
17NuZTTwYCRSZ8gFgRYgDYQxQKk60Nb/9CmNGef0KDVbO0mKGPudSuENTwuviG/FH8
18hdqPPq63UrEe79FC+yCe0bFZDv4+ZYH3GsaB7CRw7HQAePBHSJPqFzwlw69X4bhi
19TzC14gNpWsTLeGutODE+pCzwpr1l7CfwIOmCu/N92hmyBDT4GFYClJVL9YCbJHq1
20OXHUstNghnd1SppFlteS3Id6mBrHQ4E5gFfP7xKBXg==
21-----END CERTIFICATE-----
022
=== added file 'ubuntu-download-manager-tests/data/bad_key.pem'
--- ubuntu-download-manager-tests/data/bad_key.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/bad_key.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
1-----BEGIN PRIVATE KEY-----
2MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDbDw62FuVhi2+f
3FOT7KJor/P3r9hPcNa7CevG7kujOjCReWnzcxcpcACzvFEN1csqXlRh6iwLVCHug
487PfhPa6Qx4DUnC5dvzw698pLGY+ehEnD4nTruHDLSF/94qdyUoho8wmyGZQIvwN
5e6YL5KzjKD/6rTFKn+5nDM5la+BAuEuMhnRRUTeA+a1pD3syOdWZgXl+tWRRp4Tm
6CCfHfokHDrLEgWXNcw+3Gc8YN/VfgrJQRhHp0p18pX6s0QqX6R4dSaIbmCa24E8G
7EftDydUbNRVX16sInclx0p3ldb9/en2dhzjKMpD1/TUZ9KaQ4NK1ykJnNCFGWJxY
8sEwtnebfAgMBAAECggEAEELo46mFc51HNvb1HJPiBfvs2ZRV2xX9GCDKSxNXxuVu
9Wba76COipvu4WjMV4uUXlvMRcx9YoXnUu5j7tE8JhcAvvS1kgtALbNMFqOfL2z1y
10goTLxXQI/FUgVICKwLXNk/u1zvc3aSF/tnyEUgOytdYqEbDDpPeEWhAATlUYu5UP
11h9vvdTp0bKrNXGmNXzLk/cEGr0X+l+wpDDWv0uiPgL53dDk0mD5ZK/qNBDKenYrf
12LmYTsA+w/cDuFVKIrQ70Nu4OyJze3uc/1+BsMhzr8Arf8SzUzorTPliTgq4vX4N+
13k45areYfieS5Zw1db3I/e73wm4r1rV6gM4OmtSD0qQKBgQD6ebsMoVT/Iry5+iW0
14C1igt/PWm0qmoVGFbjcQNcUENNuftwSQVxB1KMyRVd5t1Jry4eK50b8brxqNrbsf
156nfCLQlFPTapcLMypTY69kJSB0FQ7vH6DSdibqg3vkGO9+kJg8AkDo/B7SwwDWJs
16w1lqO0xj8190nScHJBF6cDuLIwKBgQDf4/ADLFUq5Apu+bs4TLM0veAfX5DzXclz
17Dm5tJuJiLjwdYfY9T+wh7o9H0q5qpTCkXrGItVb2ztzGdy+zcnlyyDFUC7Sazmew
18642AE8xWWih+eWEj/dmNGc1SCduFUUVBANbNXapqbDQJUroWMEMcLc0LeG55LjP5
19LXjDR9jfFQKBgFYbdyRWaiPzyzGcP03wAJ3v31HNvRIfryjRxPg7o+lYSpBTmKwO
20YkgEqJ7mCDt1tXb+FLWQ18QqpFREf2nvbxA/70nwS1RgvBoTFdubQR12BQxPuLwf
21vYRnSkkvjNYbf++XbXx3zQ/7+w7h6w488gZFMHPD/PLX+8zGp4OSBcZFAoGBAMku
22v1t6mMVDyQRTr6I1ecro294VN+EX449Z5mx6xm5G8YnNn0EU8jDDd0iozkXSTlVF
23Ke6YVJ7O36APNXPgZ7V2oqzNH+sDkjVuVOZD5BesSDrtwxZeYwDhsJgJd5LipoJ0
24yJAdnKaouFGwXrrVf1hw55FpFIwbsmQ0MhH4G67JAoGBAMUNYhdEVHrSANOSfUgK
25eQ+0smuanLcH1DLaZCf1W4jrEcwWhLzIT175mwd9QhyW1st7BeBhmrb/GLs3Khrm
268QgaVvDuM1sIW22tqnCJBy1Z+5qwfyTcieXzTuMT8N1CqC7oArvrpccLg8ljC5r3
27nEGmZjwQEp7vpTYfkZLPGkM6
28-----END PRIVATE KEY-----
029
=== added file 'ubuntu-download-manager-tests/data/cert.pem'
--- ubuntu-download-manager-tests/data/cert.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/cert.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
1-----BEGIN CERTIFICATE-----
2MIIDfTCCAmWgAwIBAgIJAKSjaMNTvxe2MA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
3BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
4ZCBVcGdyYWRlczESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTEzMDUxMzE5NDEyMFoX
5DTIzMDUxMTE5NDEyMFowVTELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3Rh
6dGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVzMRIwEAYDVQQDDAlsb2Nh
7bGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQClg10agVIHs/fy
8Lh1b7pAIN7c+uWwRk664OmVBJXA/wPEvC1G/FtDL0QnNRWyNHZBFwippXMgyslHi
9JFHDOTONqUH4JucsrsqYsZrk6oWJXLIZ2b+v0kAJlJ4AvCdPo0aJo1egze1ZxCtM
10RuJN3yiZo6q5mYKYPOBgNcZFp2WGnxJduj7p85cp101u7WbY9i/p+idcBRs/ylhZ
11vd8SzXWH3dmsci+6auLTD3TLYnldneNZEnjNzxPuRAl3o8+VeFblM8/qIOurBxAM
12R5UPrCy0XdDELXq4Fea07qVzdzchBrcY1HykF824VI3hNiYRLOXHrJIYE/TfVwKM
13n6+ACfgDAgMBAAGjUDBOMB0GA1UdDgQWBBSClon/pvRAiAr75kZhRnklweC/8jAf
14BgNVHSMEGDAWgBSClon/pvRAiAr75kZhRnklweC/8jAMBgNVHRMEBTADAQH/MA0G
15CSqGSIb3DQEBBQUAA4IBAQCBpXr9SgJmTTP4V73Lt+MlbCt1TGSBqZ5jKCWrEy9p
16vRJhGTeQyqofAXRMD1RcFJZEonDZMVIYb+Ml25XtHbBiZUX2r1h/dfUyq8v5ZTHo
17MLs6tUUojWjQ1TQ4iRruSdAflA5A7Lsy6yEvDPreQRxi+IPmVyX/655Iv+GUZn0g
18I4trcNYoIxd+Dr+PQjF8JH/ikljt8om7gYf9OvVW+/kKjhkkBoZTVO9MMwta3USp
192uT7G/C8+90pcNe1ywB74KbzxEcd4zGZDFP+mxNfZb5XWfHgEB0Lf2aasx+fl0PD
20e+wiDfOJ8XUhG6WUfmvSVpGS0+bQgZCdarltDQiildF4
21-----END CERTIFICATE-----
022
=== added file 'ubuntu-download-manager-tests/data/expired_cert.pem'
--- ubuntu-download-manager-tests/data/expired_cert.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/expired_cert.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
1-----BEGIN CERTIFICATE-----
2MIIDfTCCAmWgAwIBAgIJAL6MaQcCVQhBMA0GCSqGSIb3DQEBBQUAMFUxCzAJBgNV
3BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
4ZCBVcGdyYWRlcjESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTEzMDUwMTIwMDUzM1oX
5DTEzMDUwMjIwMDUzM1owVTELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNvbWUtU3Rh
6dGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVyMRIwEAYDVQQDDAlsb2Nh
7bGhvc3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDRPjLNbEBSuHhy
8NhiyhHO71RTe0Lcm5GE3tZa9bymADrqnjNm5RhsP85SFy/kQ0e2LdYadA3+XrHm/
9+vXtMe7HWQPu8q+OMiMpW8knHmi2QUCqMqImoqe5Nvms93mosoKoNe2d5XzwhKyA
10DjIlW2o72OPZg5ShVZBfc5TG+2Nf5CIdagzamyOY6zfpbhfks9PiMKtHeDp05BD0
11LMsPaS947tYFVzQ3RCzKNc9JNqh43TXiywQPOvBGJnTtYDydRTUh6t2nA8c+az1+
12dSNrLh+v5+iY0z20x34ZY25bpaeIZhbrkn0T968yh1HE01niJWpz/1e6+oHxXvTv
132EVgLoh1AgMBAAGjUDBOMB0GA1UdDgQWBBQLbxWu2KYhdixmIgvV5POZYlntojAf
14BgNVHSMEGDAWgBQLbxWu2KYhdixmIgvV5POZYlntojAMBgNVHRMEBTADAQH/MA0G
15CSqGSIb3DQEBBQUAA4IBAQCLbGZ7gIU26FJp/OAbSVa0tT5pPCBNHjMNIfp/Smep
16+waPVjSzkHZCYYknP9A9/P4d+idvpTyURRkQECiiUjYzeSgF1dR3kvnsXnCJnugG
17GVeZpMnRlktb+dMcwprQhgChVyWDrMR6VpcMkoNC+yJ4XhbN0jhlooEfmnDAOI0j
185QJmhR+dzfH+xMfFlu41i/budHdwvRqU/G9eNA0i6jn1GI8LHiTRe3tPF4wDpljd
190/QR47QdiXLUsE9vDljjAI0KfXYo7KyjvdmyD3xX2QVNORlVv2GpzyREiyXnx7RB
20OmQZVDLtaFwmJSQdciZGCSm9bSLNPENAZIDpf1GKXsEx
21-----END CERTIFICATE-----
022
=== added file 'ubuntu-download-manager-tests/data/expired_key.pem'
--- ubuntu-download-manager-tests/data/expired_key.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/expired_key.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
1-----BEGIN PRIVATE KEY-----
2MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQDRPjLNbEBSuHhy
3NhiyhHO71RTe0Lcm5GE3tZa9bymADrqnjNm5RhsP85SFy/kQ0e2LdYadA3+XrHm/
4+vXtMe7HWQPu8q+OMiMpW8knHmi2QUCqMqImoqe5Nvms93mosoKoNe2d5XzwhKyA
5DjIlW2o72OPZg5ShVZBfc5TG+2Nf5CIdagzamyOY6zfpbhfks9PiMKtHeDp05BD0
6LMsPaS947tYFVzQ3RCzKNc9JNqh43TXiywQPOvBGJnTtYDydRTUh6t2nA8c+az1+
7dSNrLh+v5+iY0z20x34ZY25bpaeIZhbrkn0T968yh1HE01niJWpz/1e6+oHxXvTv
82EVgLoh1AgMBAAECggEBAM96NTWsGTvs3sGhEmwxGfEuIDuwCWvvGNb8oDPGfggU
9ktCAwYMNGNiAVs00rAsZncmjB4+5YFMtGqxaVHCWCoZwpY3R5nHBFUx1TsgTRxEx
10MsWQ32gf8N+eu4PfACtell/k2XCvlWuIouN3MBIKyxP8xDFyX3Z6OWXsXaHQs4Do
11Eje39Q5WS/LLD5+Hzg31C//u1vp4fUH/q4rZH4PFXk6WczuSItHO2FFoza67azL5
12/iJuR45tZ76ery+PKbvcxVKrJJVHxSlFA0gTBvSsZGQARex9eXlyc5rVqz+w9vDh
13P3U4fqHV4KjPLHxhp38j2lOxRo/cVsr8Zo8vMU//PyECgYEA7BD5spPODhZ9+eee
14WKdAoNoIPwUTJOdxv4pdAuBwvhcbl49uKR2tTNmfyVG3IWxzUS/nTsxcWTm8dqZU
15JRGgGq5giXP/6FOdB1zMjMwAWKJQmLMg1l8ust8zOI8B4eLiKw1X6dqg6bQeur3+
16O2ncGUVYrCvyvyABbHDYcgSUNx8CgYEA4ulil9U83D3aXuYkqL8v19aKmQmjO9WA
17wwRAIA+P1b5F07W1PQFAvBL/GXH2faG2oQyYuZeAHSmSb61SRZPgWQL/MO6L4b/f
18dsf45L/xExkrncDPeAqzX3yWG25sZ6Dx4J+DZGIB9Bw9E+iNsJKGi71ezljoKARA
19D2ZM0N8NMesCgYEAx9ZK+uBio8xokoB/rH7RmBlat7adETWYNlR0DnZfGpxHMFMs
20J0RHK3Ji8LLrOzEqocTSpAMd/i6BG1QMkWDNTyjk8hcvwMXffZcSVfJwLJgjcFDb
21cH4c8zE9lBiDuGwvl9Bw5re8VnqzNNSXfkZMG1x4BzAhC6iVa+5PXJ4BtnMCgYAe
22kax7ofmR/i82C7EynpcWb8u6NEcuX2P6Yc81woLxG7IShG9HKa0L6U8+oVDAuhF9
23ftHwZs2WoCwfKW1k/DgEJdg1Ql3L6upy+Ru5zXXvybtLhFcu59okagda6LRn/ZG4
24XiT4WA/FUCyWSwUTnZnMp5VnHSkhgvkSWgjNNs9zQwKBgQDEiTqE+8PNUJBud+7n
25RkNbke1bXxVcpQ0SrxXirWQyRP3xUgoj5aZ4BZ9yZCBkjHloNn4NteNOvbxutWle
26pISwnN385/GD19mseTQEjyFJyP+9nwQSnTuK911oQCOe/zt/9SBNW1KzRuqeyC/b
27qsi1XDRL8h6X3uEOi+6MpH11QQ==
28-----END PRIVATE KEY-----
029
=== added file 'ubuntu-download-manager-tests/data/key.pem'
--- ubuntu-download-manager-tests/data/key.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/key.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
1-----BEGIN PRIVATE KEY-----
2MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQClg10agVIHs/fy
3Lh1b7pAIN7c+uWwRk664OmVBJXA/wPEvC1G/FtDL0QnNRWyNHZBFwippXMgyslHi
4JFHDOTONqUH4JucsrsqYsZrk6oWJXLIZ2b+v0kAJlJ4AvCdPo0aJo1egze1ZxCtM
5RuJN3yiZo6q5mYKYPOBgNcZFp2WGnxJduj7p85cp101u7WbY9i/p+idcBRs/ylhZ
6vd8SzXWH3dmsci+6auLTD3TLYnldneNZEnjNzxPuRAl3o8+VeFblM8/qIOurBxAM
7R5UPrCy0XdDELXq4Fea07qVzdzchBrcY1HykF824VI3hNiYRLOXHrJIYE/TfVwKM
8n6+ACfgDAgMBAAECggEAQjxu3vOP01tXR4ji4O54n4FEiQqFUAds7XcZHFgSMsFR
9A8Wg4jsMNfSi2o4E4fhJy1DnziB+UaOBF2H3gov6sJ9ish9Hdl9A3ph8501fQVhi
10QewdRQx76hmanaquhLVPvjcrE0Q1zy2tMipP2GANDGcuJHZlh+0c0gPTI/7Yp2WO
11a5wvTh1sJRbLJbcaVBv2DppAEKreCbuytvQCjYTxzjmNzV9jVFK+KTf1f2lXrvkI
12wAXikUxEuZErvGHX1XeGv2XlIaiFdfxyEqn6T5MrNVoy24b0ib7jIMnjYCQifMBy
13TSw+NnOb8igOJd47j3oaXTl5+X42ZcGC0dzRgvJ5WQKBgQDYX7QkjnGO59FTTnki
14Z70p+DqCpwJNsyyFpqSFPYtc9+uD0PYe94ajmE68T8g0BfSfI5KdktyF4XfzoN/2
15SRezNjPiaPhys6BmW0nHo5EEXSzOqMIOH/zYDj7SgAITxP9IO2mZKwA96vR4EKsJ
16TPouGoKdFd2VC/oKnMh5Wja5HQKBgQDD0yXdqTomdAd6WeeSpRHrVxznEA1E/2rb
17WegDo4p4WDzKoMzPkiKQ2c5Zg9ynb82AcXHkeNpY+L1QZi1BSc6OH1d/Z9J1QJbk
18HAeBSpeVEoJxD/PNpmc72O+ZsW38qxLfUwgOK5oKwNUgJvaG+lrlIUCSOnF801+y
19KX4Fr9/LnwKBgDYF9yllc0717Fq7bh07/4v6EUnLvxR9VvFrwQoPartknyYDR2BF
209xTjk00LMnZiwkf1jsbPA0ZeHB/1G9YXO9agAuZVxSqGVNcZldtFqJCJXwWeNw1l
21yTB8pgzSrzIWbpKvWtdGWEIdZrqPltS0poZaUiA8dF2hZuW9bYR3FNC1AoGBALLH
22OnK75NLma01QdxJykYGB7mklRngPl8bate9chzaHmDiFxXZbvCLyNmmS8QgMElmJ
23OKmVjAJeVLfqELbiYyltg7xVVNanORrYXCG1r93xIBWIstS1bto8m8J9MiTTKk+o
24xlnphKD8m5bW+4sPVZyKVyEpKiMD9wH4z4zxnCeRAoGAWhtWSi6mfBr5VVX901Qk
25h+GDCmFYqN45fhHW+2PClYlycldjU5J4MoxFZmoGdtn+tFgwvSiC2XqNgIhDoK3I
26m584SfNywMPypVrTi163kHkHwk/67VhLEJqT3OlKZRVsDZWgq7g5ffjxZdfd7Gqz
27WdOKy8sAjcC0jYoIMQCm+jc=
28-----END PRIVATE KEY-----
029
=== added file 'ubuntu-download-manager-tests/data/nasty_cert.pem'
--- ubuntu-download-manager-tests/data/nasty_cert.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/nasty_cert.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,21 @@
1-----BEGIN CERTIFICATE-----
2MIIDiTCCAnGgAwIBAgIJALS35E1u3JqeMA0GCSqGSIb3DQEBBQUAMFsxCzAJBgNV
3BAYTAlVTMRMwEQYDVQQIDApTb21lLVN0YXRlMR0wGwYDVQQKDBRJbWFnZSBCYXNl
4ZCBVcGdyYWRlcjEYMBYGA1UEAwwPd3d3LmV4YW1wbGUuY29tMB4XDTEzMDUxNDIx
5MzczOFoXDTIzMDUxMjIxMzczOFowWzELMAkGA1UEBhMCVVMxEzARBgNVBAgMClNv
6bWUtU3RhdGUxHTAbBgNVBAoMFEltYWdlIEJhc2VkIFVwZ3JhZGVyMRgwFgYDVQQD
7DA93d3cuZXhhbXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
8AQDUSmVCIHUanrTM018h8kYAc+IAXv8EO8y1B8eO41ojd2OOq1tlhATBdgSQYvhr
90593EUHkrgu/7ouHiAcuXYR8OyliQEwlSYWLcKAL5QVrff1cTpyBWCy+mHbAPHmK
10ZK2qkLtjM7MoE1v8v+MNyXC5xodkcvlDpsci99fOAW1JbokgcQGrPFq5fRhZCk78
11mAkTYN4KV0GNIf5ubNQPrspha2DP73WxTWgv6HOKH3IcnO3rXBGWo1ywnam8vtVH
126OexphTMssdhhYxyay4cW5Jk8atvbM8xc+NGisk2KZOzL6mXJ/i8qS+3uDJoRlz2
13uGNRmN3qdCoeGk6/quY9BlQNAgMBAAGjUDBOMB0GA1UdDgQWBBT9RsLjGzSYEyzu
14qFR+KG9F8RKYhTAfBgNVHSMEGDAWgBT9RsLjGzSYEyzuqFR+KG9F8RKYhTAMBgNV
15HRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQA/ZPCrw6RLJtzUMZbTDjrDd0Wg
16UflA3K4BTXe8pJOInkwcZG/7cTs0TWpNVIXmBHxzmvWgLd8aFWTfWx1gzOyl8q4t
17CIBVsHYsqlLsIfR1vojhDDC37+9mL/lbKq6lYs45tEiDfMuRZRxK06U5tDQouEep
18DP1QSt3JOUwidGp0Xs+WsIh5WDZNr9A6BibOV14/S1e5KQ53zKEUmuw9LgmEnZ9b
19LT/DS/syhKlgTfG1iZZFqsxAWGajaohcJ1PCSFedkdUDyPsszDBlZ8OFwIZKmle7
20YKM6KV5uPrvTi5jAyjo/dfCCTqlrGbi0hSnMKR7uuwdx+f4yiIsLhW46Q/ra
21-----END CERTIFICATE-----
022
=== added file 'ubuntu-download-manager-tests/data/nasty_key.pem'
--- ubuntu-download-manager-tests/data/nasty_key.pem 1970-01-01 00:00:00 +0000
+++ ubuntu-download-manager-tests/data/nasty_key.pem 2013-11-08 17:53:31 +0000
@@ -0,0 +1,28 @@
1-----BEGIN PRIVATE KEY-----
2MIIEwAIBADANBgkqhkiG9w0BAQEFAASCBKowggSmAgEAAoIBAQDUSmVCIHUanrTM
3018h8kYAc+IAXv8EO8y1B8eO41ojd2OOq1tlhATBdgSQYvhr0593EUHkrgu/7ouH
4iAcuXYR8OyliQEwlSYWLcKAL5QVrff1cTpyBWCy+mHbAPHmKZK2qkLtjM7MoE1v8
5v+MNyXC5xodkcvlDpsci99fOAW1JbokgcQGrPFq5fRhZCk78mAkTYN4KV0GNIf5u
6bNQPrspha2DP73WxTWgv6HOKH3IcnO3rXBGWo1ywnam8vtVH6OexphTMssdhhYxy
7ay4cW5Jk8atvbM8xc+NGisk2KZOzL6mXJ/i8qS+3uDJoRlz2uGNRmN3qdCoeGk6/
8quY9BlQNAgMBAAECggEBAKt7iP34j/+30Z5e48rdFJTLBvV7xw3ZbEuThCy1FBvw
9FdiqLML8+IZ52cf0Wm1nXbnlk8+wk8cvX0BUrlBStHFRrOUzwQ6hrCFuEapqDo29
10EQseaSfGXSZ8q/gvIZKcLvjHvsasfXzS3ox1SGjbnpZCex22DgoKz3M8tvMujeQw
11z0dlk1UxQGgcd57nwGvquwOfZc2bBqID0WOREHSiif4mpHcWNUPqU6grv4TyzMCi
12j7x6oVcgkiW8pGWMMaap5S+bIy5Kv87cH0Gy1Qr/2Ar2V1d3KqV8j0lG2BovxNA8
13/+S63ReJXc9XhOy2Jcb8jMFf0m/+atg0yeoiYB6hGNUCgYEA+cxTjlFEusJS0zMs
14ZIPw3+JbBKhZKhkg23JeVDMsYxplVAgH9h5OvWqi1K8FawGxwkp7VA1cJNb/nagG
15LgjbSmsBnJbobPDo6A3eL5IlHY3oGNq/1Beod/eQ/Wp1u2R7QwyU3W0NfL3jdLVl
16vBVd9sJ0hfZg79D2WjNhSUZRNTcCgYEA2Y+tf9VpXltn9M9KYVrnFcdxG+TLsnLT
17wYhZbyfA9eZb0ZexgqE6d9QOx5zyOKU1w9Vm7vV1k8Q/yvivggfxOXB61u+Fvjy7
1897V3jcaXrdXK8XlE3xHPTaqGkCRGWpKtTRAibzlQKvUL/3WEJuXR40W/Nt93QFLb
19q3msX12notsCgYEAvxmivpjLpLivFmXqy0bpCs4nZYvJEtzAd0Gqim3Pwk1aQYwX
20UyFiiaQ/x8fRtEhKjmHesbG60XAtg5YcjDE4Wlk8lWgZjeZLt+OMHAaJIHAEpKcM
215BvpRUX/BO/h+6dmaSgB5tfb3peCoDF6EAakqPegny+afzz0ipMOFTmXPMcCgYEA
22mVXoZIaXQweNVz+aHs+guvrcP1qcLmM719Uvo2YTW7xFzozpcTYNLVNqL0nwdfgK
230sFfUN/zRHg2telcWXsbiu45xa7/RjssB8QARQ5I7R4XcOWVotq8jvK28HSAmWlz
24dzL98gIk/IHFOQEsaPXlXhdUU2pgdBdx94ND99rcQa0CgYEAgT/m6eXJK1o2lLJY
25AjBug8AYy27ATmGJDyDhdYiZgyKKi/BXjz+jROwnFO07UztWJO2OYX8+RT5cVHzf
260HzQZIId8wjVCLJIwXw6X6yZ0568cehgaOwEbuuFT2R/u+OObhY8MiQkztikAYya
27+KrVICnpThS9bGpSdeebDS9TpVI=
28-----END PRIVATE KEY-----
029
=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.cpp'
--- ubuntu-download-manager-tests/downloads/test_daemon.cpp 2013-11-07 00:04:41 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.cpp 2013-11-08 17:53:31 +0000
@@ -221,3 +221,48 @@
221 QList<MethodData> calledMethods = _man->calledMethods();221 QList<MethodData> calledMethods = _man->calledMethods();
222 QCOMPARE(1, calledMethods.count());222 QCOMPARE(1, calledMethods.count());
223}223}
224
225void
226TestDaemon::testStoppable_data() {
227 QTest::addColumn<bool>("enabled");
228
229 QTest::newRow("Enabled") << true;
230 QTest::newRow("Disabled") << false;
231}
232
233void
234TestDaemon::testStoppable() {
235 QFETCH(bool, enabled);
236 _daemon = new Daemon(_appPointer, _conn, _timer, _man, this);
237 _daemon->setStoppable(enabled);
238 QCOMPARE(_daemon->isStoppable(), enabled);
239}
240
241void
242TestDaemon::testSetTimeout_data() {
243 QTest::addColumn<bool>("enabled");
244
245 QTest::newRow("Enabled") << true;
246 QTest::newRow("Disabled") << false;
247}
248
249void
250TestDaemon::testSetTimeout() {
251 QFETCH(bool, enabled);
252 _daemon = new Daemon(_appPointer, _conn, _timer, _man, this);
253 _daemon->enableTimeout(enabled);
254 QCOMPARE(enabled, _daemon->isTimeoutEnabled());
255}
256
257void
258TestDaemon::testSetSelfSignedSslCerts() {
259 QList<QSslCertificate> certs = QSslCertificate::fromPath(
260 dataDirectory() + "/*.pem");
261 _daemon = new Daemon(_appPointer, _conn, _timer, _man, this);
262 _daemon->setSelfSignedCerts(certs);
263 QList<QSslCertificate> daemonCerts = _daemon->selfSignedCerts();
264 QCOMPARE(certs.count(), daemonCerts.count());
265 foreach(QSslCertificate cert, certs) {
266 QVERIFY(daemonCerts.contains(cert));
267 }
268}
224269
=== modified file 'ubuntu-download-manager-tests/downloads/test_daemon.h'
--- ubuntu-download-manager-tests/downloads/test_daemon.h 2013-11-07 00:04:41 +0000
+++ ubuntu-download-manager-tests/downloads/test_daemon.h 2013-11-08 17:53:31 +0000
@@ -48,6 +48,11 @@
48 void testDisableTimeout();48 void testDisableTimeout();
49 void testSelfSignedCerts();49 void testSelfSignedCerts();
50 void testSelfSignedCertsMissingPath();50 void testSelfSignedCertsMissingPath();
51 void testStoppable_data();
52 void testStoppable();
53 void testSetTimeout_data();
54 void testSetTimeout();
55 void testSetSelfSignedSslCerts();
5156
52 private:57 private:
53 FakeTimer* _timer;58 FakeTimer* _timer;

Subscribers

People subscribed via source and target branches