diff options
author | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-26 08:11:53 +0300 |
---|---|---|
committer | feistel <6742251-feistel@users.noreply.gitlab.com> | 2021-08-26 08:11:53 +0300 |
commit | aa333ba6e7c58fccb090318d4a2591a3cba645c6 (patch) | |
tree | d0a80c7c71f8929ffe6ce3b5c2deb939836338e7 /internal/httpfs/http_fs_test.go | |
parent | 05596078dbefb4449ca1c85494ead8206174040c (diff) |
refactor: clean up chrootPath from the httpfs package
Diffstat (limited to 'internal/httpfs/http_fs_test.go')
-rw-r--r-- | internal/httpfs/http_fs_test.go | 32 |
1 files changed, 2 insertions, 30 deletions
diff --git a/internal/httpfs/http_fs_test.go b/internal/httpfs/http_fs_test.go index f47e17ff..3d1092b6 100644 --- a/internal/httpfs/http_fs_test.go +++ b/internal/httpfs/http_fs_test.go @@ -19,7 +19,6 @@ func TestFSOpen(t *testing.T) { tests := map[string]struct { allowedPaths []string - chrootPath string fileName string expectedContent string expectedErrMsg string @@ -59,23 +58,11 @@ func TestFSOpen(t *testing.T) { fileName: wd + "/../httpfs/testdata/file1.txt", expectedErrMsg: os.ErrPermission.Error(), }, - "chroot_path_not_found_when_not_in_real_chroot": { - allowedPaths: []string{wd + "/testdata"}, - fileName: wd + "/testdata/file1.txt", - expectedErrMsg: "no such file or directory", - chrootPath: wd + "/testdata", - }, - "chroot_path_empty_finds_file": { - allowedPaths: []string{wd + "/testdata"}, - fileName: wd + "/testdata/file1.txt", - expectedContent: "file1.txt\n", - chrootPath: "", - }, } for name, test := range tests { t.Run(name, func(t *testing.T) { - p, err := NewFileSystemPath(test.allowedPaths, test.chrootPath) + p, err := NewFileSystemPath(test.allowedPaths) require.NoError(t, err) got, err := p.Open(test.fileName) @@ -101,7 +88,6 @@ func TestFileSystemPathCanServeHTTP(t *testing.T) { tests := map[string]struct { path string - chrootPath string fileName string escapeURL bool expectedStatusCode int @@ -150,26 +136,12 @@ func TestFileSystemPathCanServeHTTP(t *testing.T) { expectedStatusCode: http.StatusForbidden, expectedContent: "403 Forbidden\n", }, - "chroot_path_fails_in_unit_test_not_found_when_not_in_real_chroot": { - path: wd + "/testdata", - fileName: "file1.txt", - chrootPath: wd + "/testdata", - expectedStatusCode: http.StatusNotFound, - expectedContent: "404 page not found\n", - }, - "chroot_path_empty_in_unit_test_file_found": { - path: wd + "/testdata", - fileName: "file1.txt", - chrootPath: "", - expectedStatusCode: http.StatusOK, - expectedContent: "file1.txt\n", - }, } for name, test := range tests { t.Run(name, func(t *testing.T) { transport := httptransport.NewTransport() - fs, err := NewFileSystemPath([]string{test.path}, test.chrootPath) + fs, err := NewFileSystemPath([]string{test.path}) require.NoError(t, err) transport.RegisterProtocol("file", http.NewFileTransport(fs)) |