From 85656e0f5424f0b5a135852e2e259a045adf040f Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Thu, 15 May 2014 19:37:58 -0700
Subject: [PATCH] consul: FSM tests for session

---
 consul/fsm.go      |  6 +++-
 consul/fsm_test.go | 79 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 84 insertions(+), 1 deletion(-)

diff --git a/consul/fsm.go b/consul/fsm.go
index c2a1bac251..41a911a56f 100644
--- a/consul/fsm.go
+++ b/consul/fsm.go
@@ -182,7 +182,11 @@ func (c *consulFSM) applySessionOperation(buf []byte, index uint64) interface{}
 	}
 	switch req.Op {
 	case structs.SessionCreate:
-		return c.state.SessionCreate(index, &req.Session)
+		if err := c.state.SessionCreate(index, &req.Session); err != nil {
+			return err
+		} else {
+			return req.Session.ID
+		}
 	case structs.SessionDestroy:
 		return c.state.SessionDestroy(index, req.Session.ID)
 	default:
diff --git a/consul/fsm_test.go b/consul/fsm_test.go
index ac8453bec2..42708a342e 100644
--- a/consul/fsm_test.go
+++ b/consul/fsm_test.go
@@ -569,3 +569,82 @@ func TestFSM_KVSCheckAndSet(t *testing.T) {
 		t.Fatalf("bad: %v", d)
 	}
 }
+
+func TestFSM_SessionCreate_Destroy(t *testing.T) {
+	fsm, err := NewFSM(os.Stderr)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	defer fsm.Close()
+
+	fsm.state.EnsureNode(1, structs.Node{"foo", "127.0.0.1"})
+	fsm.state.EnsureCheck(2, &structs.HealthCheck{
+		Node:    "foo",
+		CheckID: "web",
+		Status:  structs.HealthPassing,
+	})
+
+	// Create a new session
+	req := structs.SessionRequest{
+		Datacenter: "dc1",
+		Op:         structs.SessionCreate,
+		Session: structs.Session{
+			Node:   "foo",
+			Checks: []string{"web"},
+		},
+	}
+	buf, err := structs.Encode(structs.SessionRequestType, req)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	resp := fsm.Apply(makeLog(buf))
+	if err, ok := resp.(error); ok {
+		t.Fatalf("resp: %v", err)
+	}
+
+	// Get the session
+	id := resp.(string)
+	_, session, err := fsm.state.SessionGet(id)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if session == nil {
+		t.Fatalf("missing")
+	}
+
+	// Verify the session
+	if session.ID != id {
+		t.Fatalf("bad: %v", *session)
+	}
+	if session.Node != "foo" {
+		t.Fatalf("bad: %v", *session)
+	}
+	if session.Checks[0] != "web" {
+		t.Fatalf("bad: %v", *session)
+	}
+
+	// Try to destroy
+	destroy := structs.SessionRequest{
+		Datacenter: "dc1",
+		Op:         structs.SessionDestroy,
+		Session: structs.Session{
+			ID: id,
+		},
+	}
+	buf, err = structs.Encode(structs.SessionRequestType, destroy)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	resp = fsm.Apply(makeLog(buf))
+	if resp != nil {
+		t.Fatalf("resp: %v", resp)
+	}
+
+	_, session, err = fsm.state.SessionGet(id)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+	if session != nil {
+		t.Fatalf("should be destroyed")
+	}
+}