etcd-agent: fix etcd agent tests, remove unused listener

tools/functional-tester/etcd-agent/agent.go

@@ -16,7 +16,6 @@ package main
 
 import (
 	"fmt"
-	"net"
 	"os"
 	"os/exec"
 	"path"
@@ -40,8 +39,6 @@ type Agent struct {
 	cmd         *exec.Cmd
 	logfile     *os.File
 	etcdLogPath string
-
-	l net.Listener
 }
 
 func newAgent(etcd, etcdLogPath string) (*Agent, error) {

tools/functional-tester/etcd-agent/agent_test.go

@@ -21,7 +21,7 @@ import (
 	"testing"
 )
 
-const etcdPath = filepath.Join(os.Getenv("GOPATH"), "bin/etcd")
+var etcdPath = filepath.Join(os.Getenv("GOPATH"), "bin/etcd")
 
 func TestAgentStart(t *testing.T) {
 	defer os.Remove("etcd.log")

tools/functional-tester/etcd-agent/rpc_test.go

@@ -25,11 +25,11 @@ import (
 )
 
 func init() {
-	defaultAgent, err := newAgent(etcdPath)
+	defaultAgent, err := newAgent(etcdPath, "etcd.log")
 	if err != nil {
 		log.Panic(err)
 	}
-	defaultAgent.serveRPC()
+	defaultAgent.serveRPC(":9027")
 }
 
 func TestRPCStart(t *testing.T) {