Merge lp:~chipaca/ubuntu-push/no-more-session-close into lp:ubuntu-push/automatic

[John Lenton]

Get rid of session.Close()

[Samuele Pedroni (pedronis)]

review: Approve

[Ubuntu One Auto Pilot (otto-pilot)]

The attempt to merge lp:~chipaca/ubuntu-push/no-more-session-close 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
/mnt/tarmac/cache/ubuntu-push-automatic/go-ws/bin/godeps -t 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/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/testing/condition launchpad.net/ubuntu-push/urldispatcher launchpad.net/ubuntu-push/urldispatcher/curldispatcher launchpad.net/ubuntu-push/util launchpad.net/ubuntu-push/server/acceptance/cmd/ launchpad.net/ubuntu-push/server/dev/ launchpad.net/ubuntu-push/ 2>/dev/null | cat > dependencies.tsv
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
co...

[Ubuntu One Auto Pilot (otto-pilot)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'client/client_test.go'
--- client/client_test.go	2015-03-17 10:42:24 +0000
+++ client/client_test.go	2015-03-18 17:44:55 +0000
@@ -529,7 +529,6 @@
 ******************************************************************/
 type derivePollerSession struct{}
 
-func (s *derivePollerSession) Close()                            {}
 func (s *derivePollerSession) ResetCookie()                      {}
 func (s *derivePollerSession) State() session.ClientSessionState { return session.Unknown }
 func (s *derivePollerSession) HasConnectivity(bool)              {}
@@ -1059,7 +1058,6 @@
 
 type loopSession struct{ hasConn bool }
 
-func (s *loopSession) Close()       {}
 func (s *loopSession) ResetCookie() {}
 func (s *loopSession) State() session.ClientSessionState {
 	if s.hasConn {

=== modified file 'client/session/session.go'
--- client/session/session.go	2015-03-18 16:53:54 +0000
+++ client/session/session.go	2015-03-18 17:44:55 +0000
@@ -128,7 +128,6 @@
 
 // ClientSession holds a client<->server session and its configuration.
 type ClientSession interface {
-	Close()
 	ResetCookie()
 	State() ClientSessionState
 	HasConnectivity(bool)
@@ -436,11 +435,6 @@
 	}()
 }
 
-func (sess *clientSession) Close() {
-	sess.stopRedial()
-	sess.doClose(false)
-}
-
 func (sess *clientSession) doClose(resetCookie bool) {
 	sess.connLock.Lock()
 	defer sess.connLock.Unlock()
@@ -748,7 +742,8 @@
 	if hasConn {
 		sess.autoRedial()
 	} else {
-		sess.Close()
+		sess.stopRedial()
+		sess.doClose(false)
 	}
 }
 

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2015-03-17 10:42:24 +0000
+++ client/session/session_test.go	2015-03-18 17:44:55 +0000
@@ -538,55 +538,10 @@
 	c.Check(sess.State(), Equals, Error)
 }
 
-/****************************************************************
-  Close() tests
-****************************************************************/
-
-func (cs *clientSessionSuite) TestClose(c *C) {
-	sess, err := NewSession("", dummyConf(), "wah", cs.lvls, cs.log)
-	c.Assert(err, IsNil)
-	sess.Connection = &testConn{Name: "TestClose"}
-	sess.Close()
-	c.Check(sess.Connection, IsNil)
-	c.Check(sess.State(), Equals, Disconnected)
-}
-
-func (cs *clientSessionSuite) TestCloseTwice(c *C) {
-	sess, err := NewSession("", dummyConf(), "wah", cs.lvls, cs.log)
-	c.Assert(err, IsNil)
-	sess.Connection = &testConn{Name: "TestCloseTwice"}
-	sess.Close()
-	c.Check(sess.Connection, IsNil)
-	sess.Close()
-	c.Check(sess.Connection, IsNil)
-	c.Check(sess.State(), Equals, Disconnected)
-}
-
-func (cs *clientSessionSuite) TestCloseFails(c *C) {
-	sess, err := NewSession("", dummyConf(), "wah", cs.lvls, cs.log)
-	c.Assert(err, IsNil)
-	sess.Connection = &testConn{Name: "TestCloseFails", CloseCondition: condition.Work(false)}
-	sess.Close()
-	c.Check(sess.Connection, IsNil) // nothing you can do to clean up anyway
-	c.Check(sess.State(), Equals, Disconnected)
-}
-
-type derp struct{ stopped bool }
-
-func (*derp) Redial() uint32 { return 0 }
-func (d *derp) Stop()        { d.stopped = true }
-
-func (cs *clientSessionSuite) TestCloseStopsRetrier(c *C) {
-	sess, err := NewSession("", dummyConf(), "wah", cs.lvls, cs.log)
-	c.Assert(err, IsNil)
-	ar := new(derp)
-	sess.retrier = ar
-	c.Check(ar.stopped, Equals, false)
-	sess.Close()
-	c.Check(ar.stopped, Equals, true)
-	sess.Close() // double close check
-	c.Check(ar.stopped, Equals, true)
-}
+type dumbRetrier struct{ stopped bool }
+
+func (*dumbRetrier) Redial() uint32 { return 0 }
+func (d *dumbRetrier) Stop()        { d.stopped = true }
 
 // /****************************************************************
 //   AutoRedial() tests
@@ -596,7 +551,7 @@
 	// checks that AutoRedial sets up a retrier and tries redialing it
 	sess, err := NewSession("", dummyConf(), "wah", cs.lvls, cs.log)
 	c.Assert(err, IsNil)
-	ar := new(derp)
+	ar := new(dumbRetrier)
 	sess.retrier = ar
 	c.Check(ar.stopped, Equals, false)
 	sess.autoRedial()
@@ -1678,7 +1633,7 @@
 	c.Assert(err, IsNil)
 	sess, err := NewSession(lst.Addr().String(), dialTestConf(), "wah", cs.lvls, cs.log)
 	c.Assert(err, IsNil)
-	defer sess.Close()
+	defer sess.StopKeepConnection()
 
 	upCh := make(chan interface{}, 5)
 	downCh := make(chan interface{}, 5)