Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests: Fix adapt test warning #6619

Merged
merged 1 commit into from
Oct 10, 2024
Merged

tests: Fix adapt test warning #6619

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions caddytest/integration/caddyfile_adapt/acme_server_sign_with_root.caddyfiletest
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
root_cn "Internal Root Cert"
intermediate_cn "Internal Intermediate Cert"
}
}
}
}

acme.example.com {
acme_server {
ca internal
sign_with_root
}
}

----------
{
"apps": {
Expand Down
3 changes: 2 additions & 1 deletion caddytest/integration/caddyfile_adapt/heredoc.caddyfiletest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
example.com {
respond <<EOF
respond <<EOF
<html>
<head><title>Foo</title>
<body>Foo</body>
</html>
EOF 200
}

----------
{
"apps": {
Expand Down
15 changes: 8 additions & 7 deletions caddytest/integration/caddyfile_adapt/map_and_vars_with_raw_types.caddyfiletest
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
example.com

map {host} {my_placeholder} {magic_number} {
map {host} {my_placeholder} {magic_number} {
# Should output boolean "true" and an integer
example.com true 3
example.com true 3

# Should output a string and null
foo.example.com "string value"
foo.example.com "string value"

# Should output two strings (quoted int)
(.*)\.example.com "${1} subdomain" "5"
(.*)\.example.com "${1} subdomain" "5"

# Should output null and a string (quoted int)
~.*\.net$ - `7`
~.*\.net$ - `7`

# Should output a float and the string "false"
~.*\.xyz$ 123.456 "false"
~.*\.xyz$ 123.456 "false"

# Should output two strings, second being escaped quote
default "unknown domain" \"""
default "unknown domain" \"""
}

vars foo bar
Expand All @@ -27,6 +27,7 @@ vars {
ghi 2.3
jkl "mn op"
}

----------
{
"apps": {
Expand Down
Loading