From 67d32e6779b8e4f67fb0902b06210596371ead7f Mon Sep 17 00:00:00 2001 From: Matthew Holt Date: Tue, 21 May 2019 13:10:14 -0600 Subject: Fix up matchers tests and take care of TODO in rewrite --- modules/caddyhttp/matchers_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'modules/caddyhttp/matchers_test.go') diff --git a/modules/caddyhttp/matchers_test.go b/modules/caddyhttp/matchers_test.go index c4c7845..59b8c76 100644 --- a/modules/caddyhttp/matchers_test.go +++ b/modules/caddyhttp/matchers_test.go @@ -240,10 +240,10 @@ func TestPathREMatcher(t *testing.T) { } for key, expectVal := range tc.expectRepl { - placeholder := fmt.Sprintf("{matchers.path_regexp.%s}", key) + placeholder := fmt.Sprintf("{http.matchers.path_regexp.%s}", key) actualVal := repl.ReplaceAll(placeholder, "") if actualVal != expectVal { - t.Errorf("Test %d [%v]: Expected placeholder {matchers.path_regexp.%s} to be '%s' but got '%s'", + t.Errorf("Test %d [%v]: Expected placeholder {http.matchers.path_regexp.%s} to be '%s' but got '%s'", i, tc.match.Pattern, key, expectVal, actualVal) continue } @@ -358,10 +358,10 @@ func TestHeaderREMatcher(t *testing.T) { } for key, expectVal := range tc.expectRepl { - placeholder := fmt.Sprintf("{matchers.header_regexp.%s}", key) + placeholder := fmt.Sprintf("{http.matchers.header_regexp.%s}", key) actualVal := repl.ReplaceAll(placeholder, "") if actualVal != expectVal { - t.Errorf("Test %d [%v]: Expected placeholder {matchers.header_regexp.%s} to be '%s' but got '%s'", + t.Errorf("Test %d [%v]: Expected placeholder {http.matchers.header_regexp.%s} to be '%s' but got '%s'", i, tc.match, key, expectVal, actualVal) continue } -- cgit v1.2.3