diff options
| author | WeidiDeng <weidi_deng@icloud.com> | 2023-05-26 03:05:00 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-25 13:05:00 -0600 |
| commit | 9cde71552576dcc724eff38dee42879c927b72ec (patch) | |
| tree | 5af6bec905fadbc7ef0f9d8be610f7ffe3758682 /caddyconfig/httpcaddyfile | |
| parent | 942fbb37ec46f1907e57a04c44ca790bd47ed52c (diff) | |
caddyfile: Track import name instead of modifying filename (#5540)
* Merge branch 'master' into import_file_stack
* remove space in log key
Diffstat (limited to 'caddyconfig/httpcaddyfile')
| -rw-r--r-- | caddyconfig/httpcaddyfile/builtins_test.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/caddyconfig/httpcaddyfile/builtins_test.go b/caddyconfig/httpcaddyfile/builtins_test.go index 34b4124..63dd141 100644 --- a/caddyconfig/httpcaddyfile/builtins_test.go +++ b/caddyconfig/httpcaddyfile/builtins_test.go @@ -229,7 +229,7 @@ func TestImportErrorLine(t *testing.T) { import t1 true }`, errorFunc: func(err error) bool { - return err != nil && strings.Contains(err.Error(), "Caddyfile:6 (import t1):2") + return err != nil && strings.Contains(err.Error(), "Caddyfile:6 (import t1)") }, }, { @@ -240,7 +240,7 @@ func TestImportErrorLine(t *testing.T) { import t1 true }`, errorFunc: func(err error) bool { - return err != nil && strings.Contains(err.Error(), "Caddyfile:5 (import t1):2") + return err != nil && strings.Contains(err.Error(), "Caddyfile:5 (import t1)") }, }, { |