luxolus/open-consul
2
0
Fork 0
Code Issues 1 Pull requests Packages Releases Wiki Activity

Remove test code duplication

Browse source
This commit is contained in:
Soren Hansen 2014-09-17 21:33:03 +02:00
parent df2959ce42
commit 2d77553be4
1 changed files with 11 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
command/agent/remote_exec_test.go
View file

@ -170,7 +170,9 @@ func TestRemoteExecWrites(t *testing.T) {
} }
} }
func TestHandleRemoteExec(t *testing.T) {
func _TestHandleRemoteExec(t *testing.T, command string, expectedSubstring string, expectedReturnCode string) {
dir, agent := makeAgent(t, nextConfig()) dir, agent := makeAgent(t, nextConfig())
defer os.RemoveAll(dir) defer os.RemoveAll(dir)
defer agent.Shutdown() defer agent.Shutdown()
@ -183,7 +185,7 @@ func TestHandleRemoteExec(t *testing.T) {
defer destroySession(t, agent, event.Session) defer destroySession(t, agent, event.Session)
spec := &remoteExecSpec{ spec := &remoteExecSpec{
Command: "uptime", Command: command,
Wait: time.Second, Wait: time.Second,
} }
buf, err := json.Marshal(spec) buf, err := json.Marshal(spec)
@ -216,74 +218,24 @@ func TestHandleRemoteExec(t *testing.T) {
key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/out/00000" key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/out/00000"
d = getKV(t, agent, key) d = getKV(t, agent, key)
if d == nil || d.Session != event.Session || if d == nil || d.Session != event.Session ||
!bytes.Contains(d.Value, []byte("load")) { !bytes.Contains(d.Value, []byte(expectedSubstring)) {
t.Fatalf("bad output: %#v", d) t.Fatalf("bad output: %#v", d)
} }
// Verify we have an exit code // Verify we have an exit code
key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/exit" key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/exit"
d = getKV(t, agent, key) d = getKV(t, agent, key)
if d == nil || d.Session != event.Session || string(d.Value) != "0" { if d == nil || d.Session != event.Session || string(d.Value) != expectedReturnCode {
t.Fatalf("bad output: %#v", d) t.Fatalf("bad output: %#v", d)
} }
} }
func TestHandleRemoteExec(t *testing.T) {
_TestHandleRemoteExec(t, "uptime", "load", "0")
}
func TestHandleRemoteExecFailed(t *testing.T) { func TestHandleRemoteExecFailed(t *testing.T) {
dir, agent := makeAgent(t, nextConfig()) _TestHandleRemoteExec(t, "echo failing;exit 2", "failing", "2")
defer os.RemoveAll(dir)
defer agent.Shutdown()
testutil.WaitForLeader(t, agent.RPC, "dc1")
event := &remoteExecEvent{
Prefix: "_rexec",
Session: makeRexecSession(t, agent),
}
defer destroySession(t, agent, event.Session)
spec := &remoteExecSpec{
Command: "echo failing;exit 2",
Wait: time.Second,
}
buf, err := json.Marshal(spec)
if err != nil {
t.Fatalf("err: %v", err)
}
key := "_rexec/" + event.Session + "/job"
setKV(t, agent, key, buf)
buf, err = json.Marshal(event)
if err != nil {
t.Fatalf("err: %v", err)
}
msg := &UserEvent{
ID: generateUUID(),
Payload: buf,
}
// Handle the event...
agent.handleRemoteExec(msg)
// Verify we have an ack
key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/ack"
d := getKV(t, agent, key)
if d == nil || d.Session != event.Session {
t.Fatalf("bad ack: %#v", d)
}
// Verify we have output
key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/out/00000"
d = getKV(t, agent, key)
if d == nil || d.Session != event.Session ||
!bytes.Contains(d.Value, []byte("failing")) {
t.Fatalf("bad output: %#v", d)
}
// Verify we have an exit code
key = "_rexec/" + event.Session + "/" + agent.config.NodeName + "/exit"
d = getKV(t, agent, key)
if d == nil || d.Session != event.Session || string(d.Value) != "2" {
t.Fatalf("bad output: %#v", d)
}
} }
func makeRexecSession(t *testing.T, agent *Agent) string { func makeRexecSession(t *testing.T, agent *Agent) string {