Ubuntu Push Notifications

Merge lp:~jonas-drange/ubuntu-push/fix-1628327 into lp:ubuntu-push

  1. fix-1628327
  2. Merge into trunk
Proposed by Jonas G. Drange
Status: Superseded
Proposed branch: lp:~jonas-drange/ubuntu-push/fix-1628327
Merge into: lp:ubuntu-push
Prerequisite: lp:~osomon/ubuntu-push/update-source-format-10
Diff against target: 219 lines (+28/-23)
16 files modified
Makefile (+2/-2)
bus/haptic/haptic.go (+2/-2)
bus/notifications/raw.go (+1/-1)
click/cnotificationsettings/cnotificationsettings.go (+1/-1)
client/client.go (+10/-2)
client/client_test.go (+3/-3)
client/service/postal.go (+1/-1)
client/session/seenstate/sqlseenstate.go (+1/-1)
client/session/seenstate/sqlseenstate_test.go (+1/-1)
debian/control (+2/-2)
debian/source/format (+1/-1)
debian/ubuntu-push-client.install (+1/-1)
debian/ubuntu-push-dev-server.install (+1/-1)
dependencies.tsv (+0/-2)
logger/logger_test.go (+0/-1)
server/api/handlers.go (+1/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/fix-1628327
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing
Ubuntu Push Hackers Pending
Review via email: mp+307039@code.launchpad.net

This proposal supersedes a proposal from 2016-09-28.

This proposal has been superseded by a proposal from 2016-09-29.

Commit message

* drops dead dependencies, replaces them with newer ones
* allows u-p to run without system image

To post a comment you must log in.
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:177
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/34/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1653/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1653
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1499/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1499/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1499/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1499/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1499/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1499
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1499/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1499/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1499/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1499/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/34/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:178
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/35/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1654/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1654
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1500/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1500/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1500/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1500/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1500/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/35/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/fix-1628327 updated
179. By Jonas G. Drange

uses dh-exec-install since we're renaming files

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:179
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/36/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1668/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1668
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1514/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1514
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1514/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1514/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1514/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1514
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1514/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1514/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/36/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/fix-1628327 updated
180. By Jonas G. Drange

revert source format change

Revision history for this message
system-apps-ci-bot (system-apps-ci-bot) wrote :

FAILED: Continuous integration, rev:180
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/37/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/1669/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-0-fetch/1669
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=amd64,release=yakkety/1515/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1515/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=armhf,release=yakkety/1515/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=vivid+overlay/1515/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=xenial+overlay/1515/console
    SUCCESS: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1515
        deb: https://jenkins.canonical.com/system-apps/job/build-2-binpkg/arch=i386,release=yakkety/1515/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-push-ci/37/rebuild

review: Needs Fixing (continuous-integration)
lp:~jonas-drange/ubuntu-push/fix-1628327 updated
181. By Jonas G. Drange

update deps tsv

182. By Jonas G. Drange

drop --with-install as it is redundant

183. By Jonas G. Drange

add upstart depends

184. By Jonas G. Drange

only allow SI to fail using a specific error message

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-03-09 16:12:39 +0000
3+++ Makefile 2016-09-29 11:48:43 +0000
4@@ -10,8 +10,8 @@
5 GODEPS = launchpad.net/gocheck
6 GODEPS += launchpad.net/go-dbus/v1
7 GODEPS += launchpad.net/go-xdg/v0
8-GODEPS += code.google.com/p/gosqlite/sqlite3
9-GODEPS += code.google.com/p/go-uuid/uuid
10+GODEPS += github.com/mattn/go-sqlite3
11+GODEPS += github.com/pborman/uuid
12
13 # cgocheck=0 is a workaround for lp:1555198
14 GOTEST := GODEBUG=cgocheck=0 ./scripts/goctest
15
16=== modified file 'bus/haptic/haptic.go'
17--- bus/haptic/haptic.go 2016-07-08 17:05:38 +0000
18+++ bus/haptic/haptic.go 2016-09-29 11:48:43 +0000
19@@ -61,8 +61,8 @@
20 return false
21 }
22
23- if (haptic.acc.SilentMode()) {
24- if (!vibrateInSilentMode()) {
25+ if haptic.acc.SilentMode() {
26+ if !vibrateInSilentMode() {
27 haptic.log.Debugf("[%s] vibrate disabled by user when in Silent Mode.", nid)
28 return false
29 }
30
31=== modified file 'bus/notifications/raw.go'
32--- bus/notifications/raw.go 2016-07-08 17:05:38 +0000
33+++ bus/notifications/raw.go 2016-09-29 11:48:43 +0000
34@@ -141,7 +141,7 @@
35 panic("please check notification is not nil before calling present")
36 }
37
38- if (!canUseBubblesNotify(app)) {
39+ if !canUseBubblesNotify(app) {
40 raw.log.Debugf("[%s] bubbles disabled by user for this app.", nid)
41
42 if raw.sound != nil {
43
44=== modified file 'click/cnotificationsettings/cnotificationsettings.go'
45--- click/cnotificationsettings/cnotificationsettings.go 2016-08-12 21:09:43 +0000
46+++ click/cnotificationsettings/cnotificationsettings.go 2016-09-29 11:48:43 +0000
47@@ -74,7 +74,7 @@
48 }
49
50 // Define notifications settings GSettings path
51- if (strcmp(pkgname, "") == 0) {
52+ if (strcmp(pkgname, "") == 0) {
53 // Use "dpkg" as package name for legacy apps
54 path = g_strconcat(SETTINGS_BASE_PATH, "dpkg/", appname, "/", NULL);
55 } else {
56
57=== modified file 'client/client.go'
58--- client/client.go 2016-03-09 16:09:34 +0000
59+++ client/client.go 2016-09-29 11:48:43 +0000
60@@ -293,11 +293,19 @@
61 util.NewAutoRedialer(client.systemImageEndp).Redial()
62 sysimg := systemimage.New(client.systemImageEndp, client.log)
63 info, err := sysimg.Information()
64+
65+ /* For now, be ignorant of what the underlying “image”
66+ is if SI does not run. See lp:1628522 */
67 if err != nil {
68- return err
69+ info = &systemimage.InfoResult{
70+ BuildNumber: 0,
71+ Device: "unknown",
72+ Channel: "",
73+ LastUpdate: "",
74+ }
75 }
76 client.systemImageInfo = info
77- return err
78+ return nil
79 }
80
81 // initSessionAndPoller creates the session and the poller objects
82
83=== modified file 'client/client_test.go'
84--- client/client_test.go 2016-03-10 13:15:36 +0000
85+++ client/client_test.go 2016-09-29 11:48:43 +0000
86@@ -713,7 +713,7 @@
87 c.Check(siCond.OK(), Equals, true)
88 }
89
90-// takeTheBus can, in fact, fail
91+// takeTheBus should work even if system image is not present on the system
92 func (cs *clientSuite) TestTakeTheBusCanFail(c *C) {
93 cli := NewPushClient(cs.configPath, cs.leveldbPath)
94 err := cli.configure()
95@@ -724,8 +724,8 @@
96 cli.connectivityEndp = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false))
97 cli.systemImageEndp = testibus.NewTestingEndpoint(condition.Work(true), condition.Work(false))
98
99- c.Check(cli.takeTheBus(), NotNil)
100- c.Assert(cli.setupPostalService(), IsNil)
101+ c.Check(cli.takeTheBus(), IsNil)
102+ c.Check(cli.systemImageInfo.Device, Equals, "unknown")
103 }
104
105 /*****************************************************************
106
107=== modified file 'client/service/postal.go'
108--- client/service/postal.go 2016-07-08 17:05:38 +0000
109+++ client/service/postal.go 2016-09-29 11:48:43 +0000
110@@ -21,7 +21,7 @@
111 "os"
112 "sync"
113
114- "code.google.com/p/go-uuid/uuid"
115+ "github.com/pborman/uuid"
116
117 "launchpad.net/ubuntu-push/bus"
118 "launchpad.net/ubuntu-push/bus/accounts"
119
120=== modified file 'client/session/seenstate/sqlseenstate.go'
121--- client/session/seenstate/sqlseenstate.go 2015-01-29 09:49:36 +0000
122+++ client/session/seenstate/sqlseenstate.go 2016-09-29 11:48:43 +0000
123@@ -21,7 +21,7 @@
124 "fmt"
125 "strings"
126
127- _ "code.google.com/p/gosqlite/sqlite3"
128+ _ "github.com/mattn/go-sqlite3"
129
130 "launchpad.net/ubuntu-push/protocol"
131 )
132
133=== modified file 'client/session/seenstate/sqlseenstate_test.go'
134--- client/session/seenstate/sqlseenstate_test.go 2015-01-29 09:49:36 +0000
135+++ client/session/seenstate/sqlseenstate_test.go 2016-09-29 11:48:43 +0000
136@@ -19,7 +19,7 @@
137 import (
138 "database/sql"
139
140- _ "code.google.com/p/gosqlite/sqlite3"
141+ _ "github.com/mattn/go-sqlite3"
142 . "launchpad.net/gocheck"
143
144 "launchpad.net/ubuntu-push/protocol"
145
146=== modified file 'debian/control'
147--- debian/control 2015-11-30 20:59:30 +0000
148+++ debian/control 2016-09-29 11:48:43 +0000
149@@ -10,8 +10,8 @@
150 golang-go-dbus-dev,
151 golang-go-xdg-dev,
152 golang-gocheck-dev,
153- golang-gosqlite-dev,
154- golang-uuid-dev,
155+ golang-github-mattn-go-sqlite3-dev,
156+ golang-github-pborman-uuid-dev,
157 libgcrypt11-dev,
158 libglib2.0-dev (>= 2.31.6),
159 libmessaging-menu-dev,
160
161=== modified file 'debian/source/format'
162--- debian/source/format 2016-09-29 11:48:43 +0000
163+++ debian/source/format 2016-05-03 07:25:50 +0000
164@@ -1,1 +1,1 @@
165-1.0
166+3.0 (quilt)
167
168=== modified file 'debian/ubuntu-push-client.install'
169--- debian/ubuntu-push-client.install 2016-07-08 17:05:38 +0000
170+++ debian/ubuntu-push-client.install 2016-09-29 11:48:43 +0000
171@@ -1,4 +1,4 @@
172-#!/usr/bin/dh-exec
173+#!/usr/bin/dh-exec --with=install
174 debian/config.json /etc/xdg/ubuntu-push-client
175 debian/ubuntu-push-client.conf /usr/share/upstart/sessions
176 debian/exec-tool /usr/lib/${DEB_HOST_MULTIARCH}/ubuntu-app-launch/push-helper
177
178=== modified file 'debian/ubuntu-push-dev-server.install'
179--- debian/ubuntu-push-dev-server.install 2014-07-17 23:01:19 +0000
180+++ debian/ubuntu-push-dev-server.install 2016-09-29 11:48:43 +0000
181@@ -1,2 +1,2 @@
182-#!/usr/bin/dh-exec
183+#!/usr/bin/dh-exec --with=install
184 usr/bin/dev => /usr/bin/ubuntu-push-dev-server
185
186=== modified file 'dependencies.tsv'
187--- dependencies.tsv 2015-11-20 15:03:47 +0000
188+++ dependencies.tsv 2016-09-29 11:48:43 +0000
189@@ -1,5 +1,3 @@
190-code.google.com/p/go-uuid hg 7dda39b2e7d5e265014674c5af696ba4186679e9 11
191-code.google.com/p/gosqlite hg 74691fb6f83716190870cde1b658538dd4b18eb0 15
192 launchpad.net/go-dbus/v1 bzr jlenton@gmail.com-20141023032446-s5icvsucwlv5o38a 129
193 launchpad.net/go-xdg/v0 bzr john.lenton@canonical.com-20140208094800-gubd5md7cro3mtxa 10
194 launchpad.net/gocheck bzr gustavo@niemeyer.net-20140225173054-xu9zlkf9kxhvow02 87
195
196=== modified file 'logger/logger_test.go'
197--- logger/logger_test.go 2016-07-18 11:12:23 +0000
198+++ logger/logger_test.go 2016-09-29 11:48:43 +0000
199@@ -140,7 +140,6 @@
200 baselog.Output(1, "foobar")
201 logger.Output(1, "foobaz")
202
203-
204 out := buf.String()
205
206 /* Workaround for https://github.com/golang/go/issues/16406 which is
207
208=== modified file 'server/api/handlers.go'
209--- server/api/handlers.go 2014-11-17 19:44:15 +0000
210+++ server/api/handlers.go 2016-09-29 11:48:43 +0000
211@@ -27,7 +27,7 @@
212 "net/http"
213 "time"
214
215- "code.google.com/p/go-uuid/uuid"
216+ "github.com/pborman/uuid"
217
218 "launchpad.net/ubuntu-push/logger"
219 "launchpad.net/ubuntu-push/protocol"

Subscribers

People subscribed via source and target branches