diff --git a/test/integration/test-cases/diff-args.sh b/test/integration/test-cases/diff-args.sh index 88b1d75e..98d54ee5 100644 --- a/test/integration/test-cases/diff-args.sh +++ b/test/integration/test-cases/diff-args.sh @@ -30,7 +30,8 @@ for i in $(seq 10); do done info "Comparing ${case_title} apply for output ${diff_args_reverse} with ${apply_out_file}" info "Comparing ${case_title} apply for stdout ${diff_args_reverse_stderr} with ${apply_out_stderr_file}" -${helmfile} -f ${diff_args_input_dir}/helmfile.yaml apply 1> ${diff_args_reverse} 2> ${diff_args_reverse_stderr} || fail "\"helmfile apply\" shouldn't fail" +${helmfile} -f ${diff_args_input_dir}/helmfile.yaml apply 1> ${diff_args_reverse}.tmp 2> ${diff_args_reverse_stderr} || fail "\"helmfile apply\" shouldn't fail" +cat ${diff_args_reverse}.tmp | sed -E '/\*{20}/,/\*{20}/d' > ${diff_args_reverse} diff -u ${apply_out_file} <(grep -vE "^(LAST DEPLOYED|installed)" ${diff_args_reverse}) || fail "\"helmfile apply\" should be consistent" diff -u ${apply_out_stderr_file} <(grep -vE "^(LAST DEPLOYED|installed)" ${diff_args_reverse_stderr}) || fail "\"helmfile apply\" should be consistent (stderr)" echo "clean up diff args resources" diff --git a/test/integration/test-cases/diff-args/output/apply b/test/integration/test-cases/diff-args/output/apply index ad082025..e326cb93 100644 --- a/test/integration/test-cases/diff-args/output/apply +++ b/test/integration/test-cases/diff-args/output/apply @@ -1,9 +1,4 @@ Comparing release=installed, chart=../../../charts/httpbin, namespace=helmfile-tests -******************** - - Release was not present in Helm. Diff will show entire contents as new. - -******************** helmfile-tests, installed-httpbin, Deployment (apps) has been added: - + apiVersion: apps/v1 diff --git a/test/integration/test-cases/diff-args/output/apply-live b/test/integration/test-cases/diff-args/output/apply-live index 14e1c5c4..b4a8d0e4 100644 --- a/test/integration/test-cases/diff-args/output/apply-live +++ b/test/integration/test-cases/diff-args/output/apply-live @@ -1,8 +1,3 @@ -******************** - - Release was not present in Helm. Diff will show entire contents as new. - -******************** helmfile-tests, installed-httpbin, Deployment (apps) has been added: - + apiVersion: apps/v1