Small follow-ups fixes for readability

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Author: vdemeester

e2e/commands_test.go

@@ -58,18 +58,18 @@ func TestRender(t *testing.T) {
 
 func testRenderApp(appPath string, env ...string) func(*testing.T) {
 	return func(t *testing.T) {
-		envs := map[string]string{}
+		envSettings := map[string]string{}
 		data, err := ioutil.ReadFile(filepath.Join(appPath, "env.yml"))
 		assert.NilError(t, err)
-		assert.NilError(t, yaml.Unmarshal(data, &envs))
-		args := []string{"render", filepath.Join(appPath, "my.dockerapp"),
+		assert.NilError(t, yaml.Unmarshal(data, &envSettings))
+		args := []string{dockerApp, "render", filepath.Join(appPath, "my.dockerapp"),
 			"-f", filepath.Join(appPath, "settings-0.yml"),
 		}
-		for k, v := range envs {
+		for k, v := range envSettings {
 			args = append(args, "-s", fmt.Sprintf("%s=%s", k, v))
 		}
 		result := icmd.RunCmd(icmd.Cmd{
-			Command: append([]string{dockerApp}, args...),
+			Command: args,
 			Env:     env,
 		}).Assert(t, icmd.Success)
 		assert.Assert(t, is.Equal(readFile(t, filepath.Join(appPath, "expected.txt")), result.Stdout()), "rendering missmatch")

e2e/main_test.go

@@ -1,6 +1,7 @@
 package e2e
 
 import (
+	"bytes"
 	"flag"
 	"os"
 	"os/exec"
@@ -37,7 +38,7 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		panic(err)
 	}
-	hasExperimental = strings.Contains(string(output), "Experimental: on")
+	hasExperimental = bytes.Contains(output, []byte("Experimental: on"))
 	i := strings.Index(string(output), "Renderers")
 	renderers = string(output)[i+10:]
 	os.Exit(m.Run())