From c054a818a1d6fee61cebc48b4286bb40d0553f4c Mon Sep 17 00:00:00 2001 From: Matt Holt Date: Sat, 1 Aug 2020 12:43:30 -0600 Subject: [PATCH] fileserver: Fix newly-introduced failing test on Linux (#3625) * fileserver: First attempt to fix failing test on Linux I think I updated the wrong test case before * Make new test function I guess what we really are trying to test is the case insensitivity of firstSplit. So a new test function is better for that. --- modules/caddyhttp/fileserver/matcher_test.go | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/modules/caddyhttp/fileserver/matcher_test.go b/modules/caddyhttp/fileserver/matcher_test.go index e3f291164d5..51cd284e85d 100644 --- a/modules/caddyhttp/fileserver/matcher_test.go +++ b/modules/caddyhttp/fileserver/matcher_test.go @@ -71,11 +71,6 @@ func TestPHPFileMatcher(t *testing.T) { expectedPath: "/foo.php.php/index.php", matched: true, }, - { - path: "/foo.php.PHP/index.php", - expectedPath: "/foo.php.PHP/index.php", - matched: true, - }, { // See https://github.com/caddyserver/caddy/issues/3623 path: "/%E2%C3", @@ -115,3 +110,12 @@ func TestPHPFileMatcher(t *testing.T) { } } } + +func TestFirstSplit(t *testing.T) { + m := MatchFile{SplitPath: []string{".php"}} + actual := m.firstSplit("index.PHP/somewhere") + expected := "index.PHP" + if actual != expected { + t.Errorf("Expected %s but got %s", expected, actual) + } +}