Merge lp:~verterok/ubuntu-push/fix-1378908 into lp:ubuntu-push

[Guillermo Gonzalez]

Add ClearCookie method to the session and call it from handleAccountsChange.

Add ClearCookie method to the session and call it from handleAccountsChange.

[John Lenton (chipaca)]

review: Approve

=== modified file 'client/client.go'
--- client/client.go	2014-09-05 10:47:29 +0000
+++ client/client.go	2014-10-23 19:33:15 +0000
@@ -471,6 +471,7 @@
 // changing) the u1 account used to auth
 func (client *PushClient) handleAccountsChange() {
 	client.log.Infof("U1 account changed; restarting session")
+	client.session.ClearCookie()
 	client.session.Close()
 }
 

=== modified file 'client/session/session.go'
--- client/session/session.go	2014-08-26 16:05:28 +0000
+++ client/session/session.go	2014-10-23 19:33:15 +0000
@@ -247,6 +247,12 @@
 	return sess.cookie
 }
 
+func (sess *ClientSession) ClearCookie() {
+	sess.connLock.Lock()
+	defer sess.connLock.Unlock()
+	sess.cookie = ""
+}
+
 // getHosts sets deliveryHosts possibly querying a remote endpoint
 func (sess *ClientSession) getHosts() error {
 	if sess.getHost != nil {

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2014-09-01 16:03:06 +0000
+++ client/session/session_test.go	2014-10-23 19:33:15 +0000
@@ -1687,3 +1687,17 @@
 	// and redialJitter got called every time shouldDelay was true
 	c.Check(n, Equals, 4)
 }
+
+/****************************************************************
+  ClearCookie() tests
+****************************************************************/
+
+func (cs *clientSessionSuite) TestClearCookie(c *C) {
+	sess, err := NewSession("foo:443", dummyConf, "", cs.lvls, cs.log)
+	c.Assert(err, IsNil)
+	c.Check(sess.getCookie(), Equals, "")
+	sess.setCookie("COOKIE")
+	c.Check(sess.getCookie(), Equals, "COOKIE")
+	sess.ClearCookie()
+	c.Check(sess.getCookie(), Equals, "")
+}