public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

chore: clean up snapshot test 

Signed-off-by: Tsubasa Nagasawa <toversus2357@gmail.com>
This commit is contained in:
Tsubasa Nagasawa 2022-07-19 00:08:09 +09:00
parent 93b1ac2b19
commit ac1edafe9a
No known key found for this signature in database
GPG Key ID: 0F2D59B46EFADB9C
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
test/e2e/template/helmfile/snapshot_test.go
View File

@ -76,7 +76,7 @@ func TestHelmfileTemplateWithBuildCommand(t *testing.T) {
chartifyTempDir = "chartify_temp"
}
// We set the envvar probided by chartify, CHARTIFY_TEMPDIR, to make the tempdir static.
// We set the envvar provided by chartify, CHARTIFY_TEMPDIR, to make the tempdir static.
chartifyTempDir = filepath.Join(wd, chartifyTempDir)
t.Setenv("CHARTIFY_TEMPDIR", chartifyTempDir)
// Ensure there's no dangling and remaining tempdir from the previous run
@ -97,7 +97,7 @@ func TestHelmfileTemplateWithBuildCommand(t *testing.T) {
containerName := "helmfile_docker_registry"
hostPort := config.LocalDockerRegistry.Port
if hostPort < 0 {
if hostPort <= 0 {
hostPort = 5000
}
@ -136,11 +136,11 @@ func TestHelmfileTemplateWithBuildCommand(t *testing.T) {
t.Logf("Output from %v: %s", args, string(got))
}
require.NoError(t, err, "Unable to run helmfile with args %v", args)
gotStr := string(got)
gotStr = strings.ReplaceAll(gotStr, fmt.Sprintf("chart=%s", wd), "chart=$WD")
require.NoError(t, err, "Unable to run helmfile with args %v", args)
if stat, _ := os.Stat(outputFile); stat != nil {
want, err := os.ReadFile(outputFile)
require.NoError(t, err)
@ -149,6 +149,7 @@ func TestHelmfileTemplateWithBuildCommand(t *testing.T) {
// To update the test golden image(output.yaml), just remove it and rerun this test.
// We automatically capture the output to `output.yaml` in the test case directory
// when the output.yaml doesn't exist.
t.Log("generate output.yaml file and write captured output to it")
require.NoError(t, os.WriteFile(outputFile, []byte(gotStr), 0664))
}
})
@ -181,8 +182,8 @@ func execHelm(t *testing.T, args ...string) string {
cmd := []string{"helm"}
cmd = append(cmd, args...)
c := strings.Join(cmd, " ")
docker := exec.Command("helm", args...)
out, err := docker.CombinedOutput()
helm := exec.Command("helm", args...)
out, err := helm.CombinedOutput()
if err != nil {
t.Logf("%s: %s", c, string(out))
t.Fatalf("Unable to run %s: %v", c, err)