fix(tests): don't make assumptions about the user's system

Sam Dodrill · Sam Dodrill · commit 06aa80e57113 · 2014-07-25T18:25:09.000-07:00
diff --git a/tests/builds_test.go b/tests/builds_test.go
@@ -45,7 +45,7 @@ func buildSetup(t *testing.T) *itutils.DeisTestConfig {
 }
 
 func buildsListTest(t *testing.T, params *itutils.DeisTestConfig) {
-	Deis := "/usr/local/bin/deis "
+	Deis := "deis "
 	cmd := itutils.GetCommand("builds", "list")
 	var cmdBuf bytes.Buffer
 	tmpl := template.Must(template.New("cmd").Parse(cmd))
diff --git a/tests/integration-utils/itutils.go b/tests/integration-utils/itutils.go
@@ -16,7 +16,7 @@ import (
 	"time"
 )
 
-var Deis = "/usr/local/bin/deis "
+var Deis = "deis "
 
 type DeisTestConfig struct {
 	AuthKey      string
@@ -80,7 +80,7 @@ func Curl(t *testing.T, params *DeisTestConfig) {
 
 func AuthCancel(t *testing.T, params *DeisTestConfig) {
 	fmt.Println("deis auth:cancel")
-	child, err := gexpect.Spawn("/usr/local/bin/deis auth:cancel")
+	child, err := gexpect.Spawn(Deis + " auth:cancel")
 	if err != nil {
 		t.Fatalf("command not started\n%v", err)
 	}

Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ func buildSetup(t testing.T) itutils.DeisTestConfig {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`func buildsListTest(t testing.T, params itutils.DeisTestConfig) {`
`48`		`- Deis := "/usr/local/bin/deis "`
	`48`	`+ Deis := "deis "`
`49`	`49`	`cmd := itutils.GetCommand("builds", "list")`
`50`	`50`	`var cmdBuf bytes.Buffer`
`51`	`51`	`tmpl := template.Must(template.New("cmd").Parse(cmd))`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ import (`
`16`	`16`	`"time"`
`17`	`17`	`)`
`18`	`18`
`19`		`-var Deis = "/usr/local/bin/deis "`
	`19`	`+var Deis = "deis "`
`20`	`20`
`21`	`21`	`type DeisTestConfig struct {`
`22`	`22`	`AuthKey string`
`@@ -80,7 +80,7 @@ func Curl(t testing.T, params DeisTestConfig) {`
`80`	`80`
`81`	`81`	`func AuthCancel(t testing.T, params DeisTestConfig) {`
`82`	`82`	`fmt.Println("deis auth:cancel")`
`83`		`- child, err := gexpect.Spawn("/usr/local/bin/deis auth:cancel")`
	`83`	`+ child, err := gexpect.Spawn(Deis + " auth:cancel")`
`84`	`84`	`if err != nil {`
`85`	`85`	`t.Fatalf("command not started\n%v", err)`
`86`	`86`	`}`