From 4efaa656f9ba34960f75465d3475045b3553fc48 Mon Sep 17 00:00:00 2001
From: Andrey Tuzhilin <andrey@3adigital.ru>
Date: Tue, 16 Mar 2021 11:47:25 +0300
Subject: [PATCH] test: return all tests

---
 test/integration/run.sh | 98 ++++++++++++++++++++---------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

diff --git a/test/integration/run.sh b/test/integration/run.sh
index 71b17523..12ac7c56 100755
--- a/test/integration/run.sh
+++ b/test/integration/run.sh
@@ -69,68 +69,68 @@ trap "{ $kubectl delete namespace ${test_ns}; }" EXIT # remove namespace wheneve
 
 # TEST CASES----------------------------------------------------------------------------------------------------------
 
-# test_start "happypath - simple rollout of httpbin chart"
+test_start "happypath - simple rollout of httpbin chart"
 
-# info "Diffing ${dir}/happypath.yaml"
-# bash -c "${helmfile} -f ${dir}/happypath.yaml diff --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
+info "Diffing ${dir}/happypath.yaml"
+bash -c "${helmfile} -f ${dir}/happypath.yaml diff --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
 
-# info "Diffing ${dir}/happypath.yaml without color"
-# bash -c "${helmfile} -f ${dir}/happypath.yaml --no-color diff --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
+info "Diffing ${dir}/happypath.yaml without color"
+bash -c "${helmfile} -f ${dir}/happypath.yaml --no-color diff --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
 
-# info "Diffing ${dir}/happypath.yaml with limited context"
-# bash -c "${helmfile} -f ${dir}/happypath.yaml diff --context 3 --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
+info "Diffing ${dir}/happypath.yaml with limited context"
+bash -c "${helmfile} -f ${dir}/happypath.yaml diff --context 3 --detailed-exitcode; code="'$?'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile diff"
 
-# info "Templating ${dir}/happypath.yaml"
-# rm -rf ${dir}/tmp
-# ${helmfile} -f ${dir}/happypath.yaml --debug template --output-dir tmp
-# code=$?
-# [ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile template: ${code}"
-# for output in $(ls -d ${dir}/tmp/*); do
-#     # e.g. test/integration/tmp/happypath-877c0dd4-helmx/helmx
-#     for release_dir in $(ls -d ${output}/*); do
-#         release_name=$(basename ${release_dir})
-#         golden_dir=${dir}/templates-golden/v${helm_major_version}/${release_name}
-#         info "Comparing template output ${release_dir}/templates with ${golden_dir}"
-#         ./diff-yamls ${golden_dir} ${release_dir}/templates || fail "unexpected diff in template result for ${release_name}"
-#     done
-# done
+info "Templating ${dir}/happypath.yaml"
+rm -rf ${dir}/tmp
+${helmfile} -f ${dir}/happypath.yaml --debug template --output-dir tmp
+code=$?
+[ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile template: ${code}"
+for output in $(ls -d ${dir}/tmp/*); do
+    # e.g. test/integration/tmp/happypath-877c0dd4-helmx/helmx
+    for release_dir in $(ls -d ${output}/*); do
+        release_name=$(basename ${release_dir})
+        golden_dir=${dir}/templates-golden/v${helm_major_version}/${release_name}
+        info "Comparing template output ${release_dir}/templates with ${golden_dir}"
+        ./diff-yamls ${golden_dir} ${release_dir}/templates || fail "unexpected diff in template result for ${release_name}"
+    done
+done
 
-# info "Applying ${dir}/happypath.yaml"
-# bash -c "${helmfile} -f ${dir}/happypath.yaml apply --detailed-exitcode; code="'$?'"; echo Code: "'$code'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile apply"
+info "Applying ${dir}/happypath.yaml"
+bash -c "${helmfile} -f ${dir}/happypath.yaml apply --detailed-exitcode; code="'$?'"; echo Code: "'$code'"; [ "'${code}'" -eq 2 ]" || fail "unexpected exit code returned by helmfile apply"
 
-# info "Syncing ${dir}/happypath.yaml"
-# ${helmfile} -f ${dir}/happypath.yaml sync
-# wait_deploy_ready httpbin-httpbin
-# retry 5 "curl --fail $(minikube service --url --namespace=${test_ns} httpbin-httpbin)/status/200"
-# [ ${retry_result} -eq 0 ] || fail "httpbin failed to return 200 OK"
+info "Syncing ${dir}/happypath.yaml"
+${helmfile} -f ${dir}/happypath.yaml sync
+wait_deploy_ready httpbin-httpbin
+retry 5 "curl --fail $(minikube service --url --namespace=${test_ns} httpbin-httpbin)/status/200"
+[ ${retry_result} -eq 0 ] || fail "httpbin failed to return 200 OK"
 
-# info "Applying ${dir}/happypath.yaml"
-# ${helmfile} -f ${dir}/happypath.yaml apply --detailed-exitcode
-# code=$?
-# [ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile apply: want 0, got ${code}"
+info "Applying ${dir}/happypath.yaml"
+${helmfile} -f ${dir}/happypath.yaml apply --detailed-exitcode
+code=$?
+[ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile apply: want 0, got ${code}"
 
-# info "Locking dependencies"
-# ${helmfile} -f ${dir}/happypath.yaml deps
-# code=$?
-# [ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile deps: ${code}"
+info "Locking dependencies"
+${helmfile} -f ${dir}/happypath.yaml deps
+code=$?
+[ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile deps: ${code}"
 
-# info "Applying ${dir}/happypath.yaml with locked dependencies"
-# ${helmfile} -f ${dir}/happypath.yaml apply
-# code=$?
-# [ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile apply: ${code}"
-# ${helm} list --namespace=${test_ns} || fail "unable to list releases"
+info "Applying ${dir}/happypath.yaml with locked dependencies"
+${helmfile} -f ${dir}/happypath.yaml apply
+code=$?
+[ ${code} -eq 0 ] || fail "unexpected exit code returned by helmfile apply: ${code}"
+${helm} list --namespace=${test_ns} || fail "unable to list releases"
 
-# info "Deleting release"
-# ${helmfile} -f ${dir}/happypath.yaml delete
-# ${helm} status --namespace=${test_ns} httpbin &> /dev/null && fail "release should not exist anymore after a delete"
+info "Deleting release"
+${helmfile} -f ${dir}/happypath.yaml delete
+${helm} status --namespace=${test_ns} httpbin &> /dev/null && fail "release should not exist anymore after a delete"
 
-# info "Ensuring \"helmfile delete\" doesn't fail when no releases installed"
-# ${helmfile} -f ${dir}/happypath.yaml delete || fail "\"helmfile delete\" shouldn't fail when there are no installed releases"
+info "Ensuring \"helmfile delete\" doesn't fail when no releases installed"
+${helmfile} -f ${dir}/happypath.yaml delete || fail "\"helmfile delete\" shouldn't fail when there are no installed releases"
 
-# info "Ensuring \"helmfile template\" output does contain only YAML docs"
-# (${helmfile} -f ${dir}/happypath.yaml template | kubectl apply -f -) || fail "\"helmfile template | kubectl apply -f -\" shouldn't fail"
+info "Ensuring \"helmfile template\" output does contain only YAML docs"
+(${helmfile} -f ${dir}/happypath.yaml template | kubectl apply -f -) || fail "\"helmfile template | kubectl apply -f -\" shouldn't fail"
 
-# test_pass "happypath"
+test_pass "happypath"
 
 if [[ helm_major_version -eq 3 ]]; then
   export VAULT_ADDR=http://127.0.0.1:8200