mirror of
https://github.com/dokku/dokku.git
synced 2026-07-11 13:01:51 +02:00
test: align logs.bats with renamed global-vector-* report keys
The previous commit renamed --logs-vector-global-image and --logs-vector-global-networks to --logs-global-vector-image and --logs-global-vector-networks, and added --logs-computed-vector-image, --logs-computed-vector-networks, and --logs-computed-vector-sink. The logs.bats per-app Invalid-flag listing was still pinned to the old 10-flag set and the vector-global JSON keys and CLI flags still used the old names, so the (logs) logs:report app, (logs:report) vector-global-image and vector-global-networks raw, and (logs) logs:set --global vector-networks tests failed - the latter cascaded because the failing assertion ran before its vector-image cleanup. Updates the per-app Invalid-flag string to the 13-flag sorted listing, renames every stale jq key and CLI flag reference, adds a parallel (logs) logs:report --global invalid flag test covering the 10-flag global-scope listing, and adds dokku logs:set --global vector-image to teardown so a future failing test doesn't leak the property.
This commit is contained in:
@@ -9,6 +9,7 @@ setup() {
|
||||
|
||||
teardown() {
|
||||
destroy_app
|
||||
dokku logs:set --global vector-image >/dev/null 2>/dev/null || true
|
||||
dokku logs:set --global vector-networks >/dev/null 2>/dev/null || true
|
||||
docker network rm test-vector-net-a >/dev/null || true
|
||||
docker network rm test-vector-net-b >/dev/null || true
|
||||
@@ -57,7 +58,7 @@ teardown() {
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
assert_output_contains "$TEST_APP logs information" 0
|
||||
assert_output_contains "Invalid flag passed, valid flags: --logs-app-label-alias, --logs-computed-app-label-alias, --logs-computed-max-size, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-sink, --logs-max-size, --logs-vector-global-image, --logs-vector-global-networks, --logs-vector-sink"
|
||||
assert_output_contains "Invalid flag passed, valid flags: --logs-app-label-alias, --logs-computed-app-label-alias, --logs-computed-max-size, --logs-computed-vector-image, --logs-computed-vector-networks, --logs-computed-vector-sink, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-image, --logs-global-vector-networks, --logs-global-vector-sink, --logs-max-size, --logs-vector-sink"
|
||||
|
||||
run /bin/bash -c "dokku logs:report $TEST_APP --logs-vector-sink 2>&1"
|
||||
echo "output: $output"
|
||||
@@ -74,6 +75,14 @@ teardown() {
|
||||
assert_output_contains "Invalid flag passed" 0
|
||||
}
|
||||
|
||||
@test "(logs) logs:report --global invalid flag" {
|
||||
run /bin/bash -c "dokku logs:report --global --invalid-flag 2>&1"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
assert_output_contains "Invalid flag passed, valid flags: --logs-computed-app-label-alias, --logs-computed-max-size, --logs-computed-vector-image, --logs-computed-vector-networks, --logs-computed-vector-sink, --logs-global-app-label-alias, --logs-global-max-size, --logs-global-vector-image, --logs-global-vector-networks, --logs-global-vector-sink"
|
||||
}
|
||||
|
||||
@test "(logs) logs:set [error]" {
|
||||
run /bin/bash -c "dokku logs:set 2>&1"
|
||||
echo "output: $output"
|
||||
@@ -528,21 +537,21 @@ teardown() {
|
||||
run /bin/bash -c "dokku logs:set --global vector-image"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-image\"'"
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-image\"'"
|
||||
assert_success
|
||||
assert_output_exists
|
||||
|
||||
run /bin/bash -c "dokku logs:set --global vector-image timberio/vector:custom"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-image\"'"
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-image\"'"
|
||||
assert_success
|
||||
assert_output "timberio/vector:custom"
|
||||
|
||||
run /bin/bash -c "dokku logs:set --global vector-image"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-vector-global-networks\"'"
|
||||
run /bin/bash -c "dokku logs:report --global --format json | jq -r '.\"logs-global-vector-networks\"'"
|
||||
assert_success
|
||||
assert_output ""
|
||||
}
|
||||
@@ -586,7 +595,7 @@ teardown() {
|
||||
assert_success
|
||||
assert_output_contains "Setting vector-networks"
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
|
||||
run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
@@ -598,7 +607,7 @@ teardown() {
|
||||
assert_success
|
||||
assert_output_contains "Setting vector-networks"
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
|
||||
run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
@@ -610,7 +619,7 @@ teardown() {
|
||||
assert_success
|
||||
assert_output_contains "Unsetting vector-networks"
|
||||
|
||||
run /bin/bash -c "dokku logs:report --global --logs-vector-global-networks 2>&1"
|
||||
run /bin/bash -c "dokku logs:report --global --logs-global-vector-networks 2>&1"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
Reference in New Issue
Block a user