Merge pull request #9130 from dokku/fix-ssh-arg-splitting
Preserve arguments such as --version and -n when running commands over SSH
This commit is contained in:
3 files changed
+29
-1
No files matched your search
@@ -37,6 +37,14 @@ teardown() {
|
||||
assert_success
|
||||
}
|
||||
|
||||
@test "(core) ssh arguments are passed through unchanged" {
|
||||
run ssh "dokku@$DOKKU_DOMAIN" fakecommand --version --help -n -e -E
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_failure
|
||||
assert_output_contains '`fakecommand --version --help -n -e -E` is not a dokku command.'
|
||||
}
|
||||
|
||||
@test "(core) urls (non-ssl)" {
|
||||
assert_urls "http://${TEST_APP}.${DOKKU_DOMAIN}"
|
||||
|
||||
|
||||
@@ -30,6 +30,26 @@ teardown() {
|
||||
assert_failure
|
||||
}
|
||||
|
||||
@test "(run) run over ssh preserves echo-like arguments" {
|
||||
run deploy_app
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
|
||||
run /bin/bash -c "ssh dokku@$DOKKU_DOMAIN run $TEST_APP /bin/echo --version --help 2>/dev/null"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
assert_output "--version --help"
|
||||
|
||||
# bats strips trailing newlines from $output, so count bytes to verify -n was honored
|
||||
run /bin/bash -c "ssh dokku@$DOKKU_DOMAIN run $TEST_APP /bin/echo -n hello 2>/dev/null | wc -c"
|
||||
echo "output: $output"
|
||||
echo "status: $status"
|
||||
assert_success
|
||||
assert_output "5"
|
||||
}
|
||||
|
||||
@test "(run) run:detached" {
|
||||
run deploy_app
|
||||
echo "output: $output"
|
||||
|
||||
Reference in new issue
Block a user