Skip to content

Commit

Permalink
fixup! Allow vault address to be specified in the vault:// URL
Browse files Browse the repository at this point in the history
  • Loading branch information
hairyhenderson committed Feb 10, 2018
1 parent 2bb7df4 commit 2599865
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion test/integration/helper.bash
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ function __gomplate_stdin () {

function start_mirror_svc () {
bin/mirror &
wait_for_url http://127.0.0.1:8080/
# wait_for_url http://127.0.0.1:8080/
}

function stop_mirror_svc () {
Expand Down
16 changes: 16 additions & 0 deletions test/integration/test.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/bash
set -euo pipefail

# This is useful for killing vault after the script exits, but causes the CircleCI
# build to fail, so... ¯\_(ツ)_/¯
# trap "exit" INT TERM
# trap "kill 0" EXIT

# TODO: export these in a bats helper, as well as only launch vault in a vault helper
export VAULT_ADDR=http://127.0.0.1:8200
export VAULT_ROOT_TOKEN=00000000-1111-2222-3333-444455556666

# fire up vault in dev mode for the vault tests
vault server -dev -dev-root-token-id=${VAULT_ROOT_TOKEN} -log-level=err >&/dev/null &

bats $(dirname $0)

0 comments on commit 2599865

Please sign in to comment.