Merge pull request #5262 from dokku/shfmt

Run shfmt against all test files
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2022-07-24 23:59:05 -04:00
commit fa9595ea35
11 files changed
+10 -17

No files matched your search

-1
View File
@@ -65,4 +65,3 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
} }
-1
View File
@@ -70,7 +70,6 @@ persist_scale_callback_a() {
mv "$APP_REPO_DIR/app-5205a.json" "$APP_REPO_DIR/app.json" mv "$APP_REPO_DIR/app-5205a.json" "$APP_REPO_DIR/app.json"
} }
persist_scale_callback_b() { persist_scale_callback_b() {
local APP="$1" local APP="$1"
local APP_REPO_DIR="$2" local APP_REPO_DIR="$2"
+1 -1
View File
@@ -140,7 +140,7 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output "" assert_output ""
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output "" assert_output ""
+4 -4
View File
@@ -20,7 +20,7 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_output "" assert_output ""
@@ -140,11 +140,11 @@ teardown() {
assert_failure assert_failure
run [ -f /home/dokku/great-test-name/VHOST ] run [ -f /home/dokku/great-test-name/VHOST ]
assert_failure assert_failure
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url great-test-name` | grep 404" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url great-test-name) | grep 404"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_failure assert_failure
@@ -152,7 +152,7 @@ teardown() {
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
-1
View File
@@ -233,7 +233,6 @@ teardown() {
assert_output_not_exists assert_output_not_exists
} }
@test "(buildpacks) buildpacks:clear" { @test "(buildpacks) buildpacks:clear" {
run /bin/bash -c "dokku buildpacks:set $TEST_APP heroku/nodejs" run /bin/bash -c "dokku buildpacks:set $TEST_APP heroku/nodejs"
echo "output: $output" echo "output: $output"
-3
View File
@@ -141,7 +141,6 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "cat /var/spool/cron/crontabs/dokku" run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
@@ -157,7 +156,6 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "cat /var/spool/cron/crontabs/dokku" run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
@@ -173,7 +171,6 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "cat /var/spool/cron/crontabs/dokku" run /bin/bash -c "cat /var/spool/cron/crontabs/dokku"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
-1
View File
@@ -303,7 +303,6 @@ teardown() {
assert_output_contains "Application deployed" assert_output_contains "Application deployed"
} }
@test "(git) git:sync private" { @test "(git) git:sync private" {
if [[ -z "$SYNC_GITHUB_USERNAME" ]] || [[ -z "$SYNC_GITHUB_PASSWORD" ]]; then if [[ -z "$SYNC_GITHUB_USERNAME" ]] || [[ -z "$SYNC_GITHUB_PASSWORD" ]]; then
skip "skipping due to missing github credentials SYNC_GITHUB_USERNAME:SYNC_GITHUB_PASSWORD" skip "skipping due to missing github credentials SYNC_GITHUB_USERNAME:SYNC_GITHUB_PASSWORD"
+1 -1
View File
@@ -77,7 +77,7 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_success assert_success
run /bin/bash -c "curl --silent --write-out '%{http_code}\n' `dokku url $TEST_APP` | grep 200" run /bin/bash -c "curl --silent --write-out '%{http_code}\n' $(dokku url $TEST_APP) | grep 200"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success assert_success
-1
View File
@@ -171,4 +171,3 @@ teardown() {
echo "status: $status" echo "status: $status"
assert_output_contains "X-Forwarded-Ssl" 0 assert_output_contains "X-Forwarded-Ssl" 0
} }
-1
View File
@@ -199,7 +199,6 @@ EOF
assert_output_contains "bar" assert_output_contains "bar"
} }
@test "(ps:set) procfile-path" { @test "(ps:set) procfile-path" {
run deploy_app dockerfile-procfile run deploy_app dockerfile-procfile
echo "output: $output" echo "output: $output"
+4 -2
View File
@@ -18,7 +18,10 @@ setup() {
# the temporary key is useful for adding in the file with two keys # the temporary key is useful for adding in the file with two keys
# useful for a negative test # useful for a negative test
{ cat /tmp/testkey.pub ; echo "$KEY" ; } > /tmp/testkey-double.pub {
cat /tmp/testkey.pub
echo "$KEY"
} >/tmp/testkey-double.pub
# another negative test input # another negative test input
echo 'invalid!' >/tmp/testkey-invalid.pub echo 'invalid!' >/tmp/testkey-invalid.pub
@@ -294,7 +297,6 @@ teardown() {
assert_equal "$output" "1" assert_equal "$output" "1"
} }
@test "(ssh-keys) ssh-keys:list --format invalid" { @test "(ssh-keys) ssh-keys:list --format invalid" {
run /bin/bash -c "dokku ssh-keys:list --format invalid" run /bin/bash -c "dokku ssh-keys:list --format invalid"
echo "output: $output" echo "output: $output"