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

[Jonas G. Drange]

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).

[Samuele Pedroni (pedronis)]

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

=== modified file 'client/service/postal_test.go'
--- client/service/postal_test.go	2016-05-03 11:12:44 +0000
+++ client/service/postal_test.go	2016-05-03 13:47:06 +0000
@@ -380,7 +380,6 @@
 // Post() tests
 
 func (ps *postalSuite) TestPostWorks(c *C) {
-	c.Skip("Skipping due to lp:1577723")
 	svc := ps.replaceBuses(NewPostalService(ps.cfg, ps.log))
 	svc.msgHandler = nil
 	ch := installTickMessageHandler(svc)

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2015-08-10 00:02:36 +0000
+++ client/session/session_test.go	2016-05-03 13:47:06 +0000
@@ -1022,7 +1022,7 @@
 }
 
 func (s *loopSuite) waitUntilRunning(c *C) {
-	delay := time.Duration(1000)
+	delay := time.Duration(5000)
 	for i := 0; i < 5; i++ {
 		if s.sess.State() == Running {
 			return

=== modified file 'debian/rules'
--- debian/rules	2016-03-10 20:24:21 +0000
+++ debian/rules	2016-05-03 13:47:06 +0000
@@ -26,7 +26,8 @@
 	(cd signing-helper && cmake . && make)
 
 override_dh_auto_test:
-	GODEBUG=cgocheck=0 dh_auto_test -O--buildsystem=golang
+	cd $$( find ./ -type d -regex '\./[^/]*/src/launchpad.net' -printf "%h\n" | head -n1) && \
+	env GODEBUG=cgocheck=0 GOPATH=$$(cd ..; pwd) go test -v $$(env GOPATH=$$(cd ..; pwd) go list $(DH_GOPKG)/... | grep -v acceptance | grep -v http13client )
 
 override_dh_install:
 	dh_install -Xusr/bin/cmd --fail-missing

=== modified file 'launch_helper/kindpool.go'
--- launch_helper/kindpool.go	2015-11-19 13:59:29 +0000
+++ launch_helper/kindpool.go	2016-05-03 13:47:06 +0000
@@ -299,6 +299,10 @@
 		return
 	}
 	pool.chDone <- args.Input.App
+	// mark it done only once we have sent the output so to order things
+	defer func() {
+		pool.chDone <- args.Input.App
+	}()
 	defer func() {
 		pool.cleanupTempFiles(args.FileIn, args.FileOut)
 	}()

=== modified file 'launch_helper/kindpool_test.go'
--- launch_helper/kindpool_test.go	2015-11-19 15:37:16 +0000
+++ launch_helper/kindpool_test.go	2016-05-03 13:47:06 +0000
@@ -497,10 +497,12 @@
 		c.Fatal("timeout waiting for result")
 	}
 	go s.fakeLauncher.done("0")
-	s.waitForArgs(c, "Launch")
 
 	res := takeNext(ch, c)
 	c.Assert(res, NotNil)
+
+	s.waitForArgs(c, "Launch")
+
 	c.Assert(res.Input, NotNil)
 	c.Assert(res.Input.App, NotNil)
 	c.Assert(res.Input.App.Original(), Equals, "com.example.test_test-app-1")