diff --git a/test/acceptance/_helpers.bash b/test/acceptance/_helpers.bash index a204f6b..59c7376 100644 --- a/test/acceptance/_helpers.bash +++ b/test/acceptance/_helpers.bash @@ -1,9 +1,9 @@ # name_prefix returns the prefix of the resources within Kubernetes. name_prefix() { - printf "consul" + printf "vault" } -# helm_install installs the Consul chart. This will source overridable +# helm_install installs the vault chart. This will source overridable # values from the "values.yaml" file in this directory. This can be set # by CI or other environments to do test-specific overrides. Note that its # easily possible to break tests this way so be careful. @@ -14,19 +14,18 @@ helm_install() { fi helm install -f ${values} \ - --name consul \ - --wait \ + --name vault \ ${BATS_TEST_DIRNAME}/../.. } -# helm_delete deletes the Consul chart and all resources. +# helm_delete deletes the vault chart and all resources. helm_delete() { - helm delete --purge consul + helm delete --purge vault kubectl delete --all pvc } # wait for a pod to be ready -wait_for_ready() { +wait_for_running() { POD_NAME=$1 check() { @@ -37,7 +36,7 @@ wait_for_ready() { kubectl get pods $1 -o json | \ jq -r 'select( .status.phase == "Running" and - ([ .status.conditions[] | select(.type == "Ready" and .status == "True") ] | length) == 1 + ([ .status.conditions[] | select(.type == "Ready" and .status == "False") ] | length) == 1 ) | .metadata.namespace + "/" + .metadata.name' } diff --git a/test/acceptance/server.bats b/test/acceptance/server.bats index dc358f6..e865dd2 100644 --- a/test/acceptance/server.bats +++ b/test/acceptance/server.bats @@ -2,16 +2,22 @@ load _helpers -@test "server: default, comes up healthy" { +@test "server: default, comes up sealed" { helm_install - wait_for_ready $(name_prefix)-server-0 + wait_for_running $(name_prefix)-server-0 # Verify there are three servers - local server_count=$(kubectl exec "$(name_prefix)-server-0" consul members | - grep server | - wc -l) - [ "${server_count}" -eq "3" ] + local sealed_status=$(kubectl exec "$(name_prefix)-server-0" -- vault status -format=json | + jq .sealed ) + [ "${sealed_status}" == "true" ] - # Clean up + local init_status=$(kubectl exec "$(name_prefix)-server-0" -- vault status -format=json | + jq .initialized) + [ "${init_status}" == "false" ] +} + +# Clean up +teardown() { + echo "helm/pvc teardown" helm_delete }