mirror of
https://github.com/rclone/rclone
synced 2024-12-21 11:45:56 +01:00
8a6fc8535d
fs.CountError is called when an error is encountered. The method was calling GlobalStats().Error(err) which incremented the error at the global stats level. This led to calls to core/stats with group= filter returning an error count of 0 even if errors actually occured. This change requires the context to be provided when calling fs.CountError. Doing so, we can retrieve the correct StatsInfo to increment the errors from. Fixes #5865
127 lines
4.0 KiB
Go
127 lines
4.0 KiB
Go
package serve
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"html/template"
|
|
"io"
|
|
"net/http"
|
|
"net/http/httptest"
|
|
"net/url"
|
|
"testing"
|
|
"time"
|
|
|
|
libhttp "github.com/rclone/rclone/lib/http"
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func GetTemplate(t *testing.T) *template.Template {
|
|
htmlTemplate, err := libhttp.GetTemplate("../../../cmd/serve/http/testdata/golden/testindex.html")
|
|
require.NoError(t, err)
|
|
return htmlTemplate
|
|
}
|
|
|
|
func TestNewDirectory(t *testing.T) {
|
|
d := NewDirectory("z", GetTemplate(t))
|
|
assert.Equal(t, "z", d.DirRemote)
|
|
assert.Equal(t, "Directory listing of /z", d.Title)
|
|
}
|
|
|
|
func TestSetQuery(t *testing.T) {
|
|
d := NewDirectory("z", GetTemplate(t))
|
|
assert.Equal(t, "", d.Query)
|
|
d.SetQuery(url.Values{"potato": []string{"42"}})
|
|
assert.Equal(t, "?potato=42", d.Query)
|
|
d.SetQuery(url.Values{})
|
|
assert.Equal(t, "", d.Query)
|
|
}
|
|
|
|
func TestAddHTMLEntry(t *testing.T) {
|
|
var modtime = time.Now()
|
|
var d = NewDirectory("z", GetTemplate(t))
|
|
d.AddHTMLEntry("", true, 0, modtime)
|
|
d.AddHTMLEntry("dir", true, 0, modtime)
|
|
d.AddHTMLEntry("a/b/c/d.txt", false, 64, modtime)
|
|
d.AddHTMLEntry("a/b/c/colon:colon.txt", false, 64, modtime)
|
|
d.AddHTMLEntry("\"quotes\".txt", false, 64, modtime)
|
|
assert.Equal(t, []DirEntry{
|
|
{remote: "", URL: "/", Leaf: "/", IsDir: true, Size: 0, ModTime: modtime},
|
|
{remote: "dir", URL: "dir/", Leaf: "dir/", IsDir: true, Size: 0, ModTime: modtime},
|
|
{remote: "a/b/c/d.txt", URL: "d.txt", Leaf: "d.txt", IsDir: false, Size: 64, ModTime: modtime},
|
|
{remote: "a/b/c/colon:colon.txt", URL: "./colon:colon.txt", Leaf: "colon:colon.txt", IsDir: false, Size: 64, ModTime: modtime},
|
|
{remote: "\"quotes\".txt", URL: "%22quotes%22.txt", Leaf: "\"quotes\".txt", Size: 64, IsDir: false, ModTime: modtime},
|
|
}, d.Entries)
|
|
|
|
// Now test with a query parameter
|
|
d = NewDirectory("z", GetTemplate(t)).SetQuery(url.Values{"potato": []string{"42"}})
|
|
d.AddHTMLEntry("file", false, 64, modtime)
|
|
d.AddHTMLEntry("dir", true, 0, modtime)
|
|
assert.Equal(t, []DirEntry{
|
|
{remote: "file", URL: "file?potato=42", Leaf: "file", IsDir: false, Size: 64, ModTime: modtime},
|
|
{remote: "dir", URL: "dir/?potato=42", Leaf: "dir/", IsDir: true, Size: 0, ModTime: modtime},
|
|
}, d.Entries)
|
|
}
|
|
|
|
func TestAddEntry(t *testing.T) {
|
|
var d = NewDirectory("z", GetTemplate(t))
|
|
d.AddEntry("", true)
|
|
d.AddEntry("dir", true)
|
|
d.AddEntry("a/b/c/d.txt", false)
|
|
d.AddEntry("a/b/c/colon:colon.txt", false)
|
|
d.AddEntry("\"quotes\".txt", false)
|
|
assert.Equal(t, []DirEntry{
|
|
{remote: "", URL: "/", Leaf: "/"},
|
|
{remote: "dir", URL: "dir/", Leaf: "dir/"},
|
|
{remote: "a/b/c/d.txt", URL: "d.txt", Leaf: "d.txt"},
|
|
{remote: "a/b/c/colon:colon.txt", URL: "./colon:colon.txt", Leaf: "colon:colon.txt"},
|
|
{remote: "\"quotes\".txt", URL: "%22quotes%22.txt", Leaf: "\"quotes\".txt"},
|
|
}, d.Entries)
|
|
|
|
// Now test with a query parameter
|
|
d = NewDirectory("z", GetTemplate(t)).SetQuery(url.Values{"potato": []string{"42"}})
|
|
d.AddEntry("file", false)
|
|
d.AddEntry("dir", true)
|
|
assert.Equal(t, []DirEntry{
|
|
{remote: "file", URL: "file?potato=42", Leaf: "file"},
|
|
{remote: "dir", URL: "dir/?potato=42", Leaf: "dir/"},
|
|
}, d.Entries)
|
|
}
|
|
|
|
func TestError(t *testing.T) {
|
|
ctx := context.Background()
|
|
w := httptest.NewRecorder()
|
|
err := errors.New("help")
|
|
Error(ctx, "potato", w, "sausage", err)
|
|
resp := w.Result()
|
|
assert.Equal(t, http.StatusInternalServerError, resp.StatusCode)
|
|
body, _ := io.ReadAll(resp.Body)
|
|
assert.Equal(t, "sausage.\n", string(body))
|
|
}
|
|
|
|
func TestServe(t *testing.T) {
|
|
d := NewDirectory("aDirectory", GetTemplate(t))
|
|
d.AddEntry("file", false)
|
|
d.AddEntry("dir", true)
|
|
|
|
w := httptest.NewRecorder()
|
|
r := httptest.NewRequest("GET", "http://example.com/aDirectory/", nil)
|
|
d.Serve(w, r)
|
|
resp := w.Result()
|
|
assert.Equal(t, http.StatusOK, resp.StatusCode)
|
|
body, _ := io.ReadAll(resp.Body)
|
|
assert.Equal(t, `<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
<meta charset="utf-8">
|
|
<title>Directory listing of /aDirectory</title>
|
|
</head>
|
|
<body>
|
|
<h1>Directory listing of /aDirectory</h1>
|
|
<a href="file">file</a><br />
|
|
<a href="dir/">dir/</a><br />
|
|
</body>
|
|
</html>
|
|
`, string(body))
|
|
}
|