Adding tests for the agent HTTP endpoints

command/agent/agent_endpoint_test.go

@@ -0,0 +1,160 @@
+package agent
+
+import (
+	"fmt"
+	"github.com/hashicorp/serf/serf"
+	"net/http"
+	"os"
+	"testing"
+	"time"
+)
+
+func TestHTTPAgentMembers(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	req, err := http.NewRequest("GET", "/v1/agent/members", nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentMembers(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	val := obj.([]serf.Member)
+	if len(val) == 0 {
+		t.Fatalf("bad members: %v", obj)
+	}
+
+	if int(val[0].Port) != srv.agent.config.SerfLanPort {
+		t.Fatalf("not lan: %v", obj)
+	}
+}
+
+func TestHTTPAgentMembers_WAN(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	req, err := http.NewRequest("GET", "/v1/agent/members?wan=true", nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentMembers(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	val := obj.([]serf.Member)
+	if len(val) == 0 {
+		t.Fatalf("bad members: %v", obj)
+	}
+
+	if int(val[0].Port) != srv.agent.config.SerfWanPort {
+		t.Fatalf("not wan: %v", obj)
+	}
+}
+
+func TestHTTPAgentJoin(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	dir2, a2 := makeAgent(t, nextConfig())
+	defer os.RemoveAll(dir2)
+	defer a2.Shutdown()
+
+	addr := fmt.Sprintf("127.0.0.1:%d", a2.config.SerfLanPort)
+	req, err := http.NewRequest("GET", fmt.Sprintf("/v1/agent/join/%s", addr), nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentJoin(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	if obj != nil {
+		t.Fatalf("Err: %v", obj)
+	}
+
+	if len(a2.LANMembers()) != 2 {
+		t.Fatalf("should have 2 members")
+	}
+}
+
+func TestHTTPAgentJoin_WAN(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	dir2, a2 := makeAgent(t, nextConfig())
+	defer os.RemoveAll(dir2)
+	defer a2.Shutdown()
+
+	addr := fmt.Sprintf("127.0.0.1:%d", a2.config.SerfWanPort)
+	req, err := http.NewRequest("GET", fmt.Sprintf("/v1/agent/join/%s?wan=true", addr), nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentJoin(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	if obj != nil {
+		t.Fatalf("Err: %v", obj)
+	}
+
+	if len(a2.WANMembers()) != 2 {
+		t.Fatalf("should have 2 members")
+	}
+}
+
+func TestHTTPAgentForceLeave(t *testing.T) {
+	dir, srv := makeHTTPServer(t)
+	defer os.RemoveAll(dir)
+	defer srv.Shutdown()
+	defer srv.agent.Shutdown()
+
+	dir2, a2 := makeAgent(t, nextConfig())
+	defer os.RemoveAll(dir2)
+	defer a2.Shutdown()
+
+	// Join first
+	addr := fmt.Sprintf("127.0.0.1:%d", a2.config.SerfLanPort)
+	_, err := srv.agent.JoinLAN([]string{addr})
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	// Shutdown, wait for detection
+	a2.Shutdown()
+	time.Sleep(500 * time.Millisecond)
+
+	// Force leave now
+	req, err := http.NewRequest("GET", fmt.Sprintf("/v1/agent/force-leave/%s", a2.config.NodeName), nil)
+	if err != nil {
+		t.Fatalf("err: %v", err)
+	}
+
+	obj, err := srv.AgentForceLeave(nil, req)
+	if err != nil {
+		t.Fatalf("Err: %v", err)
+	}
+	if obj != nil {
+		t.Fatalf("Err: %v", obj)
+	}
+
+	// SHould be left
+	mem := srv.agent.LANMembers()
+	if mem[1].Status != serf.StatusLeft {
+		t.Fatalf("should have left: %v", mem)
+	}
+}

command/agent/agent_test.go

@@ -32,10 +32,12 @@ func nextConfig() *Config {
 	cons := consul.DefaultConfig()
 	conf.ConsulConfig = cons
 
+	cons.SerfLANConfig.MemberlistConfig.SuspicionMult = 3
 	cons.SerfLANConfig.MemberlistConfig.ProbeTimeout = 100 * time.Millisecond
 	cons.SerfLANConfig.MemberlistConfig.ProbeInterval = 100 * time.Millisecond
 	cons.SerfLANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond
 
+	cons.SerfWANConfig.MemberlistConfig.SuspicionMult = 3
 	cons.SerfWANConfig.MemberlistConfig.ProbeTimeout = 100 * time.Millisecond
 	cons.SerfWANConfig.MemberlistConfig.ProbeInterval = 100 * time.Millisecond
 	cons.SerfWANConfig.MemberlistConfig.GossipInterval = 100 * time.Millisecond