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

[Jonas G. Drange]

Fix ordering issue in kindpool helper causing Postal test failures, and ignore the http13 tests.

Unmerged revisions

431. By Jonas G. Drange on 2016-05-03

unskip test, ignore http13 tests, and fix order problem in kindpool

=== modified file 'bus/connectivity/connectivity_test.go'
--- bus/connectivity/connectivity_test.go	2015-04-29 15:17:49 +0000
+++ bus/connectivity/connectivity_test.go	2016-05-03 13:46:51 +0000
@@ -167,7 +167,7 @@
 
 func (rep *racyEndpoint) GetProperty(prop string) (interface{}, error) {
 	switch prop {
-	case "state":
+	case "State":
 		rep.lock.Lock()
 		defer rep.lock.Unlock()
 		rep.stateGot = true
 
=== modified file 'bus/networkmanager/networkmanager.go'
--- bus/networkmanager/networkmanager.go	2015-03-30 12:04:49 +0000
+++ bus/networkmanager/networkmanager.go	2016-05-03 13:46:51 +0000
@@ -76,7 +76,7 @@
 */
 
 func (nm *networkManager) GetState() State {
-	s, err := nm.bus.GetProperty("state")
+	s, err := nm.bus.GetProperty("State")
 	if err != nil {
 		nm.log.Errorf("failed getting current state: %s", err)
 		nm.log.Debugf("defaulting state to Unknown")
 
=== 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:46:51 +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:46:51 +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
 
=== added directory 'debian/source'
=== removed directory 'debian/source'
=== added file 'debian/source/format'
--- debian/source/format	1970-01-01 00:00:00 +0000
+++ debian/source/format	2016-05-03 13:46:51 +0000
@@ -0,0 +1,1 @@
+3.0 (quilt)
 
=== removed file 'debian/source/format'
--- debian/source/format	2014-03-25 14:35:07 +0000
+++ debian/source/format	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-3.0 (quilt)
 
=== removed file 'docs/example-server/.bzrignore'
--- docs/example-server/.bzrignore	2014-09-05 14:57:17 +0000
+++ docs/example-server/.bzrignore	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-.git
 
=== removed file 'docs/example-server/.gitignore'
--- docs/example-server/.gitignore	2014-09-05 14:57:17 +0000
+++ docs/example-server/.gitignore	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-.bzr
-.bzrignore
-node_modules
 
=== 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:46:51 +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:46:51 +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")