Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2026-05-18 05:05:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8586 from dokku/assert-output-contains

Browse Source 
Count assert_output_contains matches as fixed strings
This commit is contained in:
Jose Diaz-Gonzalez
2026-05-09 16:00:27 -04:00
committed by GitHub
parent e78d3bcc78 f4213a4bf5
commit d00aaf3ff3
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
tests/unit/init.bats
View File

@@ -22,9 +22,10 @@ teardown() {
local CIDS=$(get_app_container_ids "$APP") local CIDS=$(get_app_container_ids "$APP")
run "$DOCKER_BIN" container top "$CIDS" run /bin/bash -c "$DOCKER_BIN container top $CIDS"
echo "output: $output" echo "output: $output"
assert_output_contains "<defunct>" "0" echo "status: $status"
assert_output_not_contains "<defunct>"
} }
@test "(init) dockerfile no tini" { @test "(init) dockerfile no tini" {
@@ -37,9 +38,10 @@ teardown() {
local CIDS=$(get_app_container_ids "$APP") local CIDS=$(get_app_container_ids "$APP")
run "$DOCKER_BIN" container top "$CIDS" run /bin/bash -c "$DOCKER_BIN container top $CIDS"
echo "output: $output" echo "output: $output"
assert_output_contains "<defunct>" "0" echo "status: $status"
assert_output_not_contains "<defunct>"
} }
@test "(init) dockerfile with tini" { @test "(init) dockerfile with tini" {
@@ -52,7 +54,8 @@ teardown() {
local CIDS=$(get_app_container_ids "$APP") local CIDS=$(get_app_container_ids "$APP")
run "$DOCKER_BIN" container top "$CIDS" run /bin/bash -c "$DOCKER_BIN container top $CIDS"
echo "output: $output" echo "output: $output"
assert_output_contains "<defunct>" "0" echo "status: $status"
assert_output_not_contains "<defunct>"
} }

7
tests/unit/test_helper.bash
View File

@@ -143,11 +143,8 @@ assert_output_contains() {
local input="$output" local input="$output"
local expected="$1" local expected="$1"
local count="${2:-1}" local count="${2:-1}"
local found=0 local found
until [ "${input/$expected/}" = "$input" ]; do found=$(printf '%s' "$input" | { grep -F -o -- "$expected" || true; } | wc -l | tr -d ' ')
input="${input/$expected/}"
found=$((found + 1))
done
if [[ "$count" -eq -1 ]]; then if [[ "$count" -eq -1 ]]; then
if [[ "$found" -gt 0 ]]; then if [[ "$found" -gt 0 ]]; then

4
tests/unit/traefik.bats
View File

@@ -468,7 +468,7 @@ teardown() {
assert_success assert_success
assert_output_contains "dns provider cf_api_email" assert_output_contains "dns provider cf_api_email"
assert_output_contains "dns provider cf_api_key" assert_output_contains "dns provider cf_api_key"
assert_output_contains "*******" assert_output_contains "*******" 2
assert_output_not_contains "test@example.com" assert_output_not_contains "test@example.com"
assert_output_not_contains "secret-key" assert_output_not_contains "secret-key"
@@ -548,7 +548,7 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
assert_output_contains "*******" assert_output_contains "*******" 2
assert_output_not_contains "test@example.com" assert_output_not_contains "test@example.com"
assert_output_not_contains "secret-key" assert_output_not_contains "secret-key"