Merge lp:~jonas-drange/ubuntu-push/lp1577723 into lp:ubuntu-push/automatic

Proposed by Jonas G. Drange on 2016-05-03
Status: Merged
Approved by: Jonas G. Drange on 2016-05-03
Approved revision: 431
Merged at revision: 431
Proposed branch: lp:~jonas-drange/ubuntu-push/lp1577723
Merge into: lp:ubuntu-push/automatic
Diff against target: 71 lines (+10/-4)
5 files modified
client/service/postal_test.go (+0/-1)
client/session/session_test.go (+1/-1)
debian/rules (+2/-1)
launch_helper/kindpool.go (+4/-0)
launch_helper/kindpool_test.go (+3/-1)
To merge this branch: bzr merge lp:~jonas-drange/ubuntu-push/lp1577723
Reviewer Review Type Date Requested Status
Samuele Pedroni 2016-05-03 Approve on 2016-05-03
Review via email: mp+293624@code.launchpad.net

Commit message

Fix ordering issue in kindpool helper causing Postal test failures, and ignore the http13 tests as well as increasing a timeout that was too short (causing ftbfs).

To post a comment you must log in.
Samuele Pedroni (pedronis) wrote :

looks good,

not sure about the debian/rules change (don't know why it was removed at some point);

small clarity comment below

review: Approve

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 2016-05-03 11:12:44 +0000
3+++ client/service/postal_test.go 2016-05-03 13:47:06 +0000
4@@ -380,7 +380,6 @@
5 // Post() tests
6
7 func (ps *postalSuite) TestPostWorks(c *C) {
8- c.Skip("Skipping due to lp:1577723")
9 svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
10 svc.msgHandler = nil
11 ch := installTickMessageHandler(svc)
12
13=== modified file 'client/session/session_test.go'
14--- client/session/session_test.go 2015-08-10 00:02:36 +0000
15+++ client/session/session_test.go 2016-05-03 13:47:06 +0000
16@@ -1022,7 +1022,7 @@
17 }
18
19 func (s *loopSuite) waitUntilRunning(c *C) {
20- delay := time.Duration(1000)
21+ delay := time.Duration(5000)
22 for i := 0; i < 5; i++ {
23 if s.sess.State() == Running {
24 return
25
26=== modified file 'debian/rules'
27--- debian/rules 2016-03-10 20:24:21 +0000
28+++ debian/rules 2016-05-03 13:47:06 +0000
29@@ -26,7 +26,8 @@
30 (cd signing-helper && cmake . && make)
31
32 override_dh_auto_test:
33- GODEBUG=cgocheck=0 dh_auto_test -O--buildsystem=golang
34+ cd $$( find ./ -type d -regex '\./[^/]*/src/launchpad.net' -printf "%h\n" | head -n1) && \
35+ env GODEBUG=cgocheck=0 GOPATH=$$(cd ..; pwd) go test -v $$(env GOPATH=$$(cd ..; pwd) go list $(DH_GOPKG)/... | grep -v acceptance | grep -v http13client )
36
37 override_dh_install:
38 dh_install -Xusr/bin/cmd --fail-missing
39
40=== modified file 'launch_helper/kindpool.go'
41--- launch_helper/kindpool.go 2015-11-19 13:59:29 +0000
42+++ launch_helper/kindpool.go 2016-05-03 13:47:06 +0000
43@@ -299,6 +299,10 @@
44 return
45 }
46 pool.chDone <- args.Input.App
47+ // mark it done only once we have sent the output so to order things
48+ defer func() {
49+ pool.chDone <- args.Input.App
50+ }()
51 defer func() {
52 pool.cleanupTempFiles(args.FileIn, args.FileOut)
53 }()
54
55=== modified file 'launch_helper/kindpool_test.go'
56--- launch_helper/kindpool_test.go 2015-11-19 15:37:16 +0000
57+++ launch_helper/kindpool_test.go 2016-05-03 13:47:06 +0000
58@@ -497,10 +497,12 @@
59 c.Fatal("timeout waiting for result")
60 }
61 go s.fakeLauncher.done("0")
62- s.waitForArgs(c, "Launch")
63
64 res := takeNext(ch, c)
65 c.Assert(res, NotNil)
66+
67+ s.waitForArgs(c, "Launch")
68+
69 c.Assert(res.Input, NotNil)
70 c.Assert(res.Input.App, NotNil)
71 c.Assert(res.Input.App.Original(), Equals, "com.example.test_test-app-1")

Subscribers

People subscribed via source and target branches