Merge lp:~pedronis/ubuntu-push/fix-acceptance-client into lp:ubuntu-push/automatic

[Samuele Pedroni]

[trivial] really use the DeviceId at Flag(0), not empty Flag(1)

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

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

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 launchpad.net/~ubuntu-push-hackers/ubuntu-push/go-uuid/uuid
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -u dependencies.tsv
"/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/src/launchpad.net/gocheck" 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 launchpad.net/~ubuntu-push-hackers/ubuntu-push/go-uuid/uuid
go test launchpad.net/ubuntu-push launchpad.net/ubuntu-push/bus launchpad.net/ubuntu-push/bus/connectivity launchpad.net/ubuntu-push/bus/networkmanager launchpad.net/ubuntu-push/bus/notifications launchpad.net/ubuntu-push/bus/systemimage launchpad.net/ubuntu-push/bus/testing launchpad.net/ubuntu-push/bus/urldispatcher 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/logger 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/testing launchpad.net/ubuntu-push/testing/condition launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/whoopsie launchpad.net/ubuntu-push/whoopsie/identifier launchpad.net/ubuntu-push/whoopsie/identifier/testing
? launchpad.net/ubuntu-push [no test files]
ok launchpad.net/ubuntu-push/bus 0.008s
ok launchpad.net/ubuntu-push/bus/connectivity 1.165s
ok launchpad.net/ubuntu-push/bus/networkmanager 0.094s
ok launchpad.net/ubuntu-push/bus/notifications 0.017s
ok launchpad.net/ubuntu-push/bus/systemimage 0.006s
ok launchpad.net/ubuntu-push/bus/testing 0.018s
ok launchpad.net/ubuntu-push/bus/urldispatcher 0.006s
ok launchpad.net/ubuntu-push/client 0.078s
ok launchpad.net/ubuntu-push/client/gethosts 0.710s
ok launchpad.net/ubuntu-push/client/service 0.007s
ok launchpad.net/ubuntu-push/client/session 0.208s
ok launchpad.net/ubuntu-push/client/session/seenstate 0.148s
ok launchpad.net/ubuntu-push/config 0.010s
ok launchpad.net/ubuntu-push/external/murmur3 0.004s
ok launchpad.net/ubuntu-push/logger 0.008s
ok launchpad.net/ubuntu-push/protocol 0.012s
ok launchpad.net/ubuntu-push/server 0.043s
ok launchpad.net/ubu...

[lp:~pedronis/ubuntu-push/fix-acceptance-client]

163. By Samuele Pedroni on 2014-05-20

up times a bit

=== modified file 'server/acceptance/cmd/acceptanceclient.go'
--- server/acceptance/cmd/acceptanceclient.go	2014-05-16 20:25:12 +0000
+++ server/acceptance/cmd/acceptanceclient.go	2014-05-20 06:51:23 +0000
@@ -69,7 +69,7 @@
 	session := &acceptance.ClientSession{
 		ExchangeTimeout: cfg.ExchangeTimeout.TimeDuration(),
 		ServerAddr:      cfg.Addr.HostPort(),
-		DeviceId:        flag.Arg(1),
+		DeviceId:        flag.Arg(0),
 		// flags
 		Model:        *deviceModel,
 		ImageChannel: *imageChannel,

=== modified file 'server/session/session_test.go'
--- server/session/session_test.go	2014-04-17 15:42:27 +0000
+++ server/session/session_test.go	2014-05-20 06:51:23 +0000
@@ -216,11 +216,6 @@
 	c.Check(err, DeepEquals, &broker.ErrAbort{"expected CONNECT message"})
 }
 
-var cfg5msPingInterval2msExchangeTout = &testSessionConfig{
-	pingInterval:    5 * time.Millisecond,
-	exchangeTimeout: 2 * time.Millisecond,
-}
-
 func (s *sessionSuite) TestSessionLoop(c *C) {
 	track := &testTracker{NewTracker(s.testlog), make(chan interface{}, 2)}
 	errCh := make(chan error, 1)
@@ -229,21 +224,26 @@
 	tp := &testProtocol{up, down}
 	sess := &testing.TestBrokerSession{}
 	go func() {
-		errCh <- sessionLoop(tp, sess, cfg5msPingInterval2msExchangeTout, track)
+		errCh <- sessionLoop(tp, sess, cfg10msPingInterval5msExchangeTout, track)
 	}()
-	c.Check(takeNext(down), Equals, "deadline 2ms")
+	c.Check(takeNext(down), Equals, "deadline 5ms")
 	c.Check(takeNext(down), DeepEquals, protocol.PingPongMsg{Type: "ping"})
 	up <- nil // no write error
 	up <- protocol.PingPongMsg{Type: "pong"}
-	c.Check(takeNext(down), Equals, "deadline 2ms")
+	c.Check(takeNext(down), Equals, "deadline 5ms")
 	c.Check(takeNext(down), DeepEquals, protocol.PingPongMsg{Type: "ping"})
 	up <- nil // no write error
 	up <- io.ErrUnexpectedEOF
 	err := <-errCh
 	c.Check(err, Equals, io.ErrUnexpectedEOF)
 	c.Check(track.interval, HasLen, 2)
-	c.Check((<-track.interval).(time.Duration) <= 8*time.Millisecond, Equals, true)
-	c.Check((<-track.interval).(time.Duration) <= 8*time.Millisecond, Equals, true)
+	c.Check((<-track.interval).(time.Duration) <= 16*time.Millisecond, Equals, true)
+	c.Check((<-track.interval).(time.Duration) <= 16*time.Millisecond, Equals, true)
+}
+
+var cfg5msPingInterval2msExchangeTout = &testSessionConfig{
+	pingInterval:    5 * time.Millisecond,
+	exchangeTimeout: 2 * time.Millisecond,
 }
 
 func (s *sessionSuite) TestSessionLoopWriteError(c *C) {