Merge lp:~chipaca/ubuntu-push/home-cooking-client-session-style into lp:ubuntu-push

[John Lenton]

That's all, folks.

Client session, volume 6: Home cooking, client-session-style.

[lp:~chipaca/ubuntu-push/home-cooking-client-session-style]

42. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

43. By John Lenton on 2014-01-31

renamed the fake server in TestResets to "srv" (from "lp")

44. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

45. By John Lenton on 2014-01-31

Fixed a test binding all ifaces

46. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

47. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

48. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

49. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

50. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

51. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

52. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

53. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

[Samuele Pedroni (pedronis)]

31 + sess.Log.Errorf("%s", err)

seems that error needs a prefix of sort

[Samuele Pedroni (pedronis)]

98 +func (cs *clientSessionSuite) TestResets(c *C) {

it's hard to tell what this is testing concretely? it's not cliear it's checking the various bits of channel resetting for example

maybe run/Run should set a flag on the session or something to use here?

[Samuele Pedroni (pedronis)]

Run and Reset need descriptions

[Samuele Pedroni (pedronis)]

vaguer comments:

bit unsure about the assymmetry that the happy start path has you call Dial and Run,

and Reset does both for you,

also not sure about Run doing "go ..." for you

Unmerged revisions

53. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

52. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

51. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

50. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

49. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

48. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

47. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

46. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

45. By John Lenton on 2014-01-31

Fixed a test binding all ifaces

44. By John Lenton on 2014-01-31

Merged elements-of-client-session-toponomy into home-cooking-client-session-style.

=== modified file 'client/session/session.go'
--- client/session/session.go	2014-01-31 17:52:59 +0000
+++ client/session/session.go	2014-01-31 17:52:59 +0000
@@ -203,3 +203,34 @@
 	sess.Log.Debugf("Connected %v.", conn.LocalAddr())
 	return nil
 }
+
+func (sess *ClientSession) Run() {
+	go func() {
+		err := sess.checkRunnable()
+		if err == nil {
+			err = sess.start()
+			if err == nil {
+				err = sess.run()
+			}
+		}
+		sess.ErrCh <- err
+	}()
+}
+
+func (sess *ClientSession) Reset() error {
+	if sess.Protocolator == nil {
+		return errors.New("Can't Reset() without a protocol constructor.")
+	}
+	if sess.Connection != nil {
+		sess.Close() // just in case
+	}
+	err := sess.Dial()
+	if err != nil {
+		sess.Log.Errorf("%s", err)
+		return err
+	}
+	sess.ErrCh = make(chan error, 1)
+	sess.MsgCh = make(chan *Notification)
+	sess.Run()
+	return nil
+}

=== modified file 'client/session/session_test.go'
--- client/session/session_test.go	2014-01-31 17:52:59 +0000
+++ client/session/session_test.go	2014-01-31 17:52:59 +0000
@@ -559,3 +559,74 @@
 	err = <-errCh
 	c.Assert(err, IsNil)
 }
+
+/****************************************************************
+  Run() tests
+****************************************************************/
+
+func (cs *clientSessionSuite) TestRunRuns(c *C) {
+	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	c.Assert(err, IsNil)
+	sess.Connection = &testConn{Name: "TestRunRuns"}
+	upCh := make(chan interface{}, 5)
+	downCh := make(chan interface{}, 5)
+	proto := &testProtocol{up: upCh, down: downCh}
+	sess.Protocolator = func(_ net.Conn) protocol.Protocol { return proto }
+	sess.ErrCh = make(chan error, 1)
+
+	sess.Run()
+
+	// now walk it through start()
+	takeNext(downCh) // connectMsg
+	upCh <- nil      // no error
+	upCh <- protocol.ConnAckMsg{
+		Type:   "connack",
+		Params: protocol.ConnAckParams{(10 * time.Millisecond).String()},
+	}
+	// in the mainloop!
+	upCh <- io.EOF
+	err = <-sess.ErrCh
+	c.Check(err, Equals, io.EOF)
+}
+
+/****************************************************************
+  Reset() tests
+****************************************************************/
+
+func (cs *clientSessionSuite) TestResetFailsWithoutProtocolator(c *C) {
+	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	c.Assert(err, IsNil)
+	sess.Protocolator = nil
+	err = sess.Reset()
+	c.Assert(err, NotNil)
+	c.Check(err.Error(), Matches, ".*protocol constructor\\.")
+}
+
+func (cs *clientSessionSuite) TestResetFailsWithNoAddress(c *C) {
+	sess, err := NewSession("", nil, 0, "wah", debuglog)
+	c.Assert(err, IsNil)
+	err = sess.Reset()
+	c.Assert(err, NotNil)
+	c.Check(err.Error(), Matches, ".*dial.*address.*")
+}
+
+func (cs *clientSessionSuite) TestResets(c *C) {
+	upCh := make(chan interface{}, 5)
+	downCh := make(chan interface{}, 5)
+	srv, err := net.Listen("tcp", "localhost:0")
+	c.Assert(err, IsNil)
+	defer srv.Close()
+
+	sess, err := NewSession(srv.Addr().String(), nil, 0, "wah", debuglog)
+	c.Assert(err, IsNil)
+	proto := &testProtocol{up: upCh, down: downCh}
+	sess.Connection = &testConn{Name: "TestResets"}
+	sess.Protocolator = func(_ net.Conn) protocol.Protocol { return proto }
+
+	sess.Reset()
+
+	// wheee
+	err = <-sess.ErrCh
+	c.Assert(err, NotNil) // some random tcp error because
+	// there's nobody talking to the port
+}