Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tools/functional-tester: minor cleanup

Browse Source
This commit is contained in:
Gyu-Ho Lee 2016-02-03 14:13:43 -08:00
parent 6da3c08b4d
commit ed682c9f08
4 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/functional-tester/etcd-agent/agent_test.go
View File

@ -23,20 +23,24 @@ import (
const etcdPath = "./etcd" const etcdPath = "./etcd"
func TestAgentStart(t *testing.T) { func TestAgentStart(t *testing.T) {
defer os.Remove("etcd.log")
a, dir := newTestAgent(t) a, dir := newTestAgent(t)
defer a.terminate() defer a.terminate()
err := a.start("-data-dir", dir) err := a.start("--data-dir", dir)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
} }
func TestAgentRestart(t *testing.T) { func TestAgentRestart(t *testing.T) {
defer os.Remove("etcd.log")
a, dir := newTestAgent(t) a, dir := newTestAgent(t)
defer a.terminate() defer a.terminate()
err := a.start("-data-dir", dir) err := a.start("--data-dir", dir)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -52,9 +56,11 @@ func TestAgentRestart(t *testing.T) {
} }
func TestAgentTerminate(t *testing.T) { func TestAgentTerminate(t *testing.T) {
defer os.Remove("etcd.log")
a, dir := newTestAgent(t) a, dir := newTestAgent(t)
err := a.start("-data-dir", dir) err := a.start("--data-dir", dir)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

1
tools/functional-tester/etcd-agent/rpc.go
View File

@ -30,6 +30,7 @@ func (a *Agent) serveRPC() {
if e != nil { if e != nil {
log.Fatal("agent:", e) log.Fatal("agent:", e)
} }
log.Println("agent listening on :9027")
go http.Serve(l, nil) go http.Serve(l, nil)
} }

8
tools/functional-tester/etcd-agent/rpc_test.go
View File

@ -43,7 +43,7 @@ func TestRPCStart(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var pid int var pid int
err = c.Call("Agent.RPCStart", []string{"-data-dir", dir}, &pid) err = c.Call("Agent.RPCStart", []string{"--data-dir", dir}, &pid)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -66,7 +66,7 @@ func TestRPCRestart(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var pid int var pid int
err = c.Call("Agent.RPCStart", []string{"-data-dir", dir}, &pid) err = c.Call("Agent.RPCStart", []string{"--data-dir", dir}, &pid)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -111,7 +111,7 @@ func TestRPCTerminate(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var pid int var pid int
err = c.Call("Agent.RPCStart", []string{"-data-dir", dir}, &pid) err = c.Call("Agent.RPCStart", []string{"--data-dir", dir}, &pid)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
@ -146,7 +146,7 @@ func TestRPCStatus(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
var pid int var pid int
err = c.Call("Agent.RPCStart", []string{"-data-dir", dir}, &pid) err = c.Call("Agent.RPCStart", []string{"--data-dir", dir}, &pid)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

8
tools/functional-tester/etcd-tester/cluster.go
View File

@ -23,7 +23,7 @@ import (
"time" "time"
"github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context" "github.com/coreos/etcd/Godeps/_workspace/src/golang.org/x/net/context"
etcdclient "github.com/coreos/etcd/client" clientv2 "github.com/coreos/etcd/client"
"github.com/coreos/etcd/tools/functional-tester/etcd-agent/client" "github.com/coreos/etcd/tools/functional-tester/etcd-agent/client"
) )
@ -198,15 +198,15 @@ func (c *cluster) Status() ClusterStatus {
// setHealthKey sets health key on all given urls. // setHealthKey sets health key on all given urls.
func setHealthKey(us []string) error { func setHealthKey(us []string) error {
for _, u := range us { for _, u := range us {
cfg := etcdclient.Config{ cfg := clientv2.Config{
Endpoints: []string{u}, Endpoints: []string{u},
} }
c, err := etcdclient.New(cfg) c, err := clientv2.New(cfg)
if err != nil { if err != nil {
return err return err
} }
ctx, cancel := context.WithTimeout(context.Background(), time.Second) ctx, cancel := context.WithTimeout(context.Background(), time.Second)
kapi := etcdclient.NewKeysAPI(c) kapi := clientv2.NewKeysAPI(c)
_, err = kapi.Set(ctx, "health", "good", nil) _, err = kapi.Set(ctx, "health", "good", nil)
cancel() cancel()
if err != nil { if err != nil {