From 3f26c08fd0998f40aeafd2d5be15a66bf29f47e1 Mon Sep 17 00:00:00 2001
From: Gareth Smith <gsmith@pivotal.io>
Date: Mon, 18 Dec 2017 14:41:49 +0000
Subject: [PATCH] Replace Etcd.PathFinder with Etcd.Path

---
 pkg/framework/test/etcd.go      | 8 ++++----
 pkg/framework/test/etcd_test.go | 9 +--------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/pkg/framework/test/etcd.go b/pkg/framework/test/etcd.go
index 6f46522cc..e18727801 100644
--- a/pkg/framework/test/etcd.go
+++ b/pkg/framework/test/etcd.go
@@ -16,7 +16,7 @@ import (
 // in the documentation for the `APIServer`, as both implement a `ControlPaneProcess`.
 type Etcd struct {
 	AddressManager AddressManager
-	PathFinder     BinPathFinder
+	Path           string
 	ProcessStarter SimpleSessionStarter
 	DataDirManager DataDirManager
 	StopTimeout    time.Duration
@@ -92,7 +92,7 @@ func (e *Etcd) Start() error {
 		"serving insecure client requests on %s", host))
 	timedOut := time.After(e.StartTimeout)
 
-	command := exec.Command(e.PathFinder("etcd"), args...)
+	command := exec.Command(e.Path, args...)
 	e.session, err = e.ProcessStarter(command, e.stdOut, e.stdErr)
 	if err != nil {
 		return err
@@ -107,8 +107,8 @@ func (e *Etcd) Start() error {
 }
 
 func (e *Etcd) ensureInitialized() {
-	if e.PathFinder == nil {
-		e.PathFinder = DefaultBinPathFinder
+	if e.Path == "" {
+		e.Path = DefaultBinPathFinder("etcd")
 	}
 
 	if e.AddressManager == nil {
diff --git a/pkg/framework/test/etcd_test.go b/pkg/framework/test/etcd_test.go
index fad7427a0..a13ff5bf8 100644
--- a/pkg/framework/test/etcd_test.go
+++ b/pkg/framework/test/etcd_test.go
@@ -19,7 +19,6 @@ var _ = Describe("Etcd", func() {
 	var (
 		fakeSession        *testfakes.FakeSimpleSession
 		fakeDataDirManager *testfakes.FakeDataDirManager
-		fakePathFinder     *testfakes.FakeBinPathFinder
 		fakeAddressManager *testfakes.FakeAddressManager
 		etcd               *Etcd
 		etcdStopper        chan struct{}
@@ -28,7 +27,6 @@ var _ = Describe("Etcd", func() {
 	BeforeEach(func() {
 		fakeSession = &testfakes.FakeSimpleSession{}
 		fakeDataDirManager = &testfakes.FakeDataDirManager{}
-		fakePathFinder = &testfakes.FakeBinPathFinder{}
 		fakeAddressManager = &testfakes.FakeAddressManager{}
 
 		etcdStopper = make(chan struct{}, 1)
@@ -39,7 +37,7 @@ var _ = Describe("Etcd", func() {
 
 		etcd = &Etcd{
 			AddressManager: fakeAddressManager,
-			PathFinder:     fakePathFinder.Spy,
+			Path:           "/path/to/some/etcd",
 			DataDirManager: fakeDataDirManager,
 			StopTimeout:    500 * time.Millisecond,
 		}
@@ -55,7 +53,6 @@ var _ = Describe("Etcd", func() {
 				fakeSession.ExitCodeReturnsOnCall(0, -1)
 				fakeSession.ExitCodeReturnsOnCall(1, 143)
 
-				fakePathFinder.ReturnsOnCall(0, "/path/to/some/etcd")
 				fakeAddressManager.InitializeReturns(1234, "this.is.etcd.listening.for.clients", nil)
 
 				etcd.ProcessStarter = func(command *exec.Cmd, out, err io.Writer) (SimpleSession, error) {
@@ -70,10 +67,6 @@ var _ = Describe("Etcd", func() {
 				err := etcd.Start()
 				Expect(err).NotTo(HaveOccurred())
 
-				By("...in turn calling the PathFinder")
-				Expect(fakePathFinder.CallCount()).To(Equal(1))
-				Expect(fakePathFinder.ArgsForCall(0)).To(Equal("etcd"))
-
 				By("...in turn calling using the AddressManager")
 				Expect(fakeAddressManager.InitializeCallCount()).To(Equal(1))