Merge pull request #3346 from bacongobbler/1817-add-deis-envvar-tests

Matthew Fisher · Matthew Fisher · commit d82049066818 · 2015-03-20T15:34:03.000-07:00
test(tests/config_test.go): add DEIS_APP and DEIS_RELEASE tests
diff --git a/tests/config_test.go b/tests/config_test.go
@@ -49,6 +49,8 @@ func configSetup(t *testing.T) *utils.DeisTestConfig {
 	utils.Execute(t, configSetBuildpackCmd, cfg, false, "https://github.com/heroku/heroku-buildpack-go#98f37cc")
 	utils.Execute(t, gitPushCmd, cfg, false, "")
 	utils.CurlWithFail(t, cfg, false, "the Deis team")
+	utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_APP", false)
+	utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_RELEASE", false)
 	if err := utils.Chdir(".."); err != nil {
 		t.Fatal(err)
 	}
diff --git a/tests/utils/itutils.go b/tests/utils/itutils.go
@@ -196,11 +196,10 @@ func CheckList(
 	if err != nil {
 		t.Fatal(err)
 	}
-	if strings.Contains(stdout.String(), contain) == notflag {
-		if notflag {
-			t.Fatalf(
-				"Didn't expect '%s' in command output:\n%v", contain, stdout)
-		}
+	if notflag && strings.Contains(stdout.String(), contain) {
+		t.Fatalf("Didn't expect '%s' in command output:\n%v", contain, stdout)
+	}
+	if !notflag && !strings.Contains(stdout.String(), contain) {
 		t.Fatalf("Expected '%s' in command output:\n%v", contain, stdout)
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ func configSetup(t testing.T) utils.DeisTestConfig {`
`49`	`49`	`utils.Execute(t, configSetBuildpackCmd, cfg, false, "https://github.com/heroku/heroku-buildpack-go#98f37cc")`
`50`	`50`	`utils.Execute(t, gitPushCmd, cfg, false, "")`
`51`	`51`	`utils.CurlWithFail(t, cfg, false, "the Deis team")`
	`52`	`+ utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_APP", false)`
	`53`	`+ utils.CheckList(t, "run env --app={{.AppName}}", cfg, "DEIS_RELEASE", false)`
`52`	`54`	`if err := utils.Chdir(".."); err != nil {`
`53`	`55`	`t.Fatal(err)`
`54`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -196,11 +196,10 @@ func CheckList(`
`196`	`196`	`if err != nil {`
`197`	`197`	`t.Fatal(err)`
`198`	`198`	`}`
`199`		`- if strings.Contains(stdout.String(), contain) == notflag {`
`200`		`- if notflag {`
`201`		`- t.Fatalf(`
`202`		`- "Didn't expect '%s' in command output:\n%v", contain, stdout)`
`203`		`- }`
	`199`	`+ if notflag && strings.Contains(stdout.String(), contain) {`
	`200`	`+ t.Fatalf("Didn't expect '%s' in command output:\n%v", contain, stdout)`
	`201`	`+ }`
	`202`	`+ if !notflag && !strings.Contains(stdout.String(), contain) {`
`204`	`203`	`t.Fatalf("Expected '%s' in command output:\n%v", contain, stdout)`
`205`	`204`	`}`
`206`	`205`	`}`