Merge lp:~pedronis/ubuntu-push/fix-flaky-test into lp:ubuntu-push/automatic

Proposed by Samuele Pedroni
Status: Merged
Approved by: Samuele Pedroni
Approved revision: 396
Merged at revision: 396
Proposed branch: lp:~pedronis/ubuntu-push/fix-flaky-test
Merge into: lp:ubuntu-push/automatic
Diff against target: 23 lines (+5/-2)
1 file modified
client/service/postal_test.go (+5/-2)
To merge this branch: bzr merge lp:~pedronis/ubuntu-push/fix-flaky-test
Reviewer Review Type Date Requested Status
Samuele Pedroni Approve
Review via email: mp+256526@code.launchpad.net

Commit message

fix flaky test

Description of the change

fix flaky test

To post a comment you must log in.
Revision history for this message
Samuele Pedroni (pedronis) :
review: Approve
Revision history for this message
Ubuntu One Auto Pilot (otto-pilot) wrote :
Download full text (12.5 KiB)

The attempt to merge lp:~pedronis/ubuntu-push/fix-flaky-test into lp:ubuntu-push/automatic failed. Below is the output from the failed tests.

scripts/deps.sh ubuntu-push-client.go
scripts/deps.sh server/dev/server.go
scripts/deps.sh server/acceptance/cmd/acceptanceclient.go
rm -f -r /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin
mkdir -p /mnt/tarmac/cache/ubuntu-push-automatic/go-ws/pkg
go get -u launchpad.net/godeps
go get -d -u launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
code.google.com/p/go-uuid now at 7dda39b2e7d5e265014674c5af696ba4186679e9
launchpad.net/go-dbus/v1 now at <email address hidden>
go install launchpad.net/gocheck launchpad.net/go-dbus/v1 launchpad.net/go-xdg/v0 code.google.com/p/gosqlite/sqlite3 code.google.com/p/go-uuid/uuid
./scripts/goctest launchpad.net/ubuntu-push launchpad.net/ubuntu-push/accounts launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/accounts launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/emblemcounter launchpad.net/ubuntu-push/bus/haptic launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/polld launchpad.net/ubuntu-push/bus/powerd launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/unitygreeter launchpad.net/ubuntu-push/bus/urfkill launchpad.net/ubuntu-push/bus/windowstack launchpad.net/ubuntu-push/click launchpad.net/ubuntu-push/click/cappinfo launchpad.net/ubuntu-push/click/cblacklist launchpad.net/ubuntu-push/click/cclick launchpad.net/ubuntu-push/click/testing launchpad.net/ubuntu-push/client launchpad.net/ubuntu-push/client/gethosts launchpad.net/ubuntu-push/client/service launchpad.net/ubuntu-push/client/session launchpad.net/ubuntu-push/client/session/seenstate launchpad.net/ubuntu-push/config launchpad.net/ubuntu-push/external/murmur3 launchpad.net/ubuntu-push/identifier launchpad.net/ubuntu-push/identifier/testing launchpad.net/ubuntu-push/launch_helper launchpad.net/ubuntu-push/launch_helper/cual launchpad.net/ubuntu-push/launch_helper/helper_finder launchpad.net/ubuntu-push/launch_helper/legacy launchpad.net/ubuntu-push/logger launchpad.net/ubuntu-push/messaging launchpad.net/ubuntu-push/messaging/cmessaging launchpad.net/ubuntu-push/messaging/reply launchpad.net/ubuntu-push/nih launchpad.net/ubuntu-push/nih/cnih launchpad.net/ubuntu-push/poller launchpad.net/ubuntu-push/protocol launchpad.net/ubuntu-push/server launchpad.net/ubuntu-push/server/api launchpad.net/ubuntu-push/server/broker launchpad.net/ubuntu-push/server/broker/simple launchpad.net/ubuntu-push/server/broker/testing launchpad.net/ubuntu-push/server/broker/testsuite launchpad.net/ubuntu-push/server/dev launchpad.net/ubuntu-push/server/listener launchpad.net/ubuntu-push/server/session launchpad.net/ubuntu-push/server/store launchpad.net/ubuntu-push/sounds launchpad.net/ubuntu-push/testing launchpad.net/ubuntu-push/te...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'client/service/postal_test.go'
2--- client/service/postal_test.go 2015-03-05 14:09:54 +0000
3+++ client/service/postal_test.go 2015-04-16 15:48:24 +0000
4@@ -592,14 +592,17 @@
5
6 func (ps *postalSuite) TestMessageHandlerReportsFailedNotifies(c *C) {
7 endp := testibus.NewTestingEndpoint(condition.Work(true), condition.Work(true), 1)
8+ nopTicker := make(chan []interface{})
9+ testibus.SetWatchSource(endp, "ActionInvoked", nopTicker)
10+ defer close(nopTicker)
11 svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
12 svc.NotificationsEndp = endp
13 c.Assert(svc.Start(), IsNil)
14 card := &launch_helper.Card{Icon: "icon-value", Summary: "summary-value", Body: "body-value", Popup: true}
15 notif := &launch_helper.Notification{Card: card}
16 output := &launch_helper.HelperOutput{Notification: notif}
17- err := svc.messageHandler(&click.AppId{}, "", output)
18- c.Assert(err, NotNil)
19+ b := svc.messageHandler(&click.AppId{}, "", output)
20+ c.Check(b, Equals, false)
21 }
22
23 func (ps *postalSuite) TestMessageHandlerInhibition(c *C) {

Subscribers

People subscribed via source and target branches