fix: correct warning placement and update tests to account for parallel's behavior

This commit is contained in:
Jose Diaz-Gonzalez
2024-03-14 14:59:49 -04:00
parent 36ade1ecd0
commit 6e3631afeb
2 changed files with 40 additions and 27 deletions

View File

@@ -130,37 +130,48 @@ teardown() {
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Port publishing may not work as expected with multiple containers" 0
assert_output_contains "Port publishing may not work as expected with zero downtime" 0
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
run /bin/bash -c "dokku ps:scale $TEST_APP web=2"
run /bin/bash -c "dokku docker-options:add $TEST_APP deploy '--publish 5000:5000'"
echo "output: $output"
echo "status: $status"
assert_success
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Port publishing may not work as expected with multiple containers" 1
assert_output_contains "Port publishing may not work as expected with zero downtime" 0
run /bin/bash -c "dokku ps:scale --skip-deploy $TEST_APP web=2"
echo "output: $output"
echo "status: $status"
assert_success
run deploy_app
# the expected output will be seen twice due to how parallel re-outputs stderr in its own output...
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 2
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
run /bin/bash -c "dokku ps:scale --skip-deploy $TEST_APP web=1"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Port publishing may not work as expected with multiple containers" 0
assert_output_contains "Port publishing may not work as expected with zero downtime" 1
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 2
run /bin/bash -c "dokku checks:disable $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Port publishing may not work as expected with multiple containers" 0
assert_output_contains "Port publishing may not work as expected with zero downtime" 0
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
}