Skip to content

Commit 7cdc851

Browse files
authored
Merge pull request #372 from cipherstash/fix-intermittent-tests
fix(ci): resolve PG 17 showcase test failure
2 parents 60c3a39 + e9c995d commit 7cdc851

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

mise.toml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,13 +83,13 @@ if [ "${CS_DATABASE__HOST}" == "localhost" ]; then
8383
{% raw %}
8484
running_postgres="$(docker ps --filter "name=postgres" --filter "health=healthy" --format "{{.Names}};{{.Ports}}")"
8585
{% endraw %}
86-
if [ -z "${running_postgres}" ] || [ -z $(echo ${running_postgres} | grep ${CS_DATABASE__PORT}) ] ; then
86+
if [ -z "${running_postgres}" ] || [ -z "$(echo "${running_postgres}" | grep "${CS_DATABASE__PORT}")" ] ; then
8787
echo "error: Could not detect a running, healthy postgres container with port ${CS_DATABASE__PORT}"
8888
echo "error: Try running 'mise run postgres:up' to start a container"
8989
exit 68
9090
fi
91-
echo $running_postgres
92-
export CS_DATABASE__HOST=$(echo $running_postgres | grep ${CS_DATABASE__PORT} | cut -d ';' -f 1)
91+
echo "${running_postgres}"
92+
export CS_DATABASE__HOST=$(echo "${running_postgres}" | grep "${CS_DATABASE__PORT}" | cut -d ';' -f 1)
9393
echo "Using postgres running in container: ${CS_DATABASE__HOST}"
9494
fi
9595
@@ -688,6 +688,7 @@ fi
688688

689689
[tasks."test:integration:showcase"]
690690
description = "Run Showcase integration test"
691+
dir = "{{config_root}}/tests"
691692
run = """
692693
mise --env tls run proxy:up proxy-tls --extra-args "--detach --wait"
693694
mise --env tls run test:wait_for_postgres_to_quack --port 6432 --max-retries 20 --tls

0 commit comments

Comments
 (0)