TrueCloudLab/rclone
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

serve webdav: add tests for serve http functionality

Browse source
This commit is contained in:
Gary Kim 2019-06-12 20:01:48 +08:00 committed by Nick Craig-Wood
parent 622e0d19ce
commit 5597d6d871
18 changed files with 229 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cmd/serve/webdav/testdata/golden/a.txt vendored Normal file
View file

@ -0,0 +1 @@
three

1
cmd/serve/webdav/testdata/golden/dirnotfound.html vendored Normal file
View file

@ -0,0 +1 @@
Directory not found

1
cmd/serve/webdav/testdata/golden/hidden.txt vendored Normal file
View file

@ -0,0 +1 @@
Not Found

1
cmd/serve/webdav/testdata/golden/hiddendir.html vendored Normal file
View file

@ -0,0 +1 @@
Directory not found

13
cmd/serve/webdav/testdata/golden/index.html vendored Normal file
View file

@ -0,0 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Directory listing of /</title>
</head>
<body>
<h1>Directory listing of /</h1>
<a href="one%25.txt">one%.txt</a><br />
<a href="three/">three/</a><br />
<a href="two.txt">two.txt</a><br />
</body>
</html>

0
cmd/serve/webdav/testdata/golden/indexhead.txt vendored Normal file
View file

1
cmd/serve/webdav/testdata/golden/indexpost.txt vendored Normal file
View file

@ -0,0 +1 @@
Method Not Allowed

1
cmd/serve/webdav/testdata/golden/notfound.html vendored Normal file
View file

@ -0,0 +1 @@
Not Found

1
cmd/serve/webdav/testdata/golden/one.txt vendored Normal file
View file

@ -0,0 +1 @@
one%

0
cmd/serve/webdav/testdata/golden/onehead.txt vendored Normal file
View file

1
cmd/serve/webdav/testdata/golden/onepost.txt vendored Normal file
View file

@ -0,0 +1 @@
one%

12
cmd/serve/webdav/testdata/golden/three.html vendored Normal file
View file

@ -0,0 +1,12 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<title>Directory listing of /three</title>
</head>
<body>
<h1>Directory listing of /three</h1>
<a href="a.txt">a.txt</a><br />
<a href="b.txt">b.txt</a><br />
</body>
</html>

1
cmd/serve/webdav/testdata/golden/two-6.txt vendored Normal file
View file

@ -0,0 +1 @@
0123456

1
cmd/serve/webdav/testdata/golden/two.txt vendored Normal file
View file

@ -0,0 +1 @@
0123456789

1
cmd/serve/webdav/testdata/golden/two2-5.txt vendored Normal file
View file

@ -0,0 +1 @@
2345

1
cmd/serve/webdav/testdata/golden/two3-.txt vendored Normal file
View file

@ -0,0 +1 @@
3456789

4
cmd/serve/webdav/webdav.go
View file

@ -22,8 +22,8 @@ import (
)
var (
hashName string
hashType = hash.None
hashName string
hashType = hash.None
disableGETDir = false
)

190
cmd/serve/webdav/webdav_test.go
View file

@ -8,14 +8,22 @@
package webdav
import (
"flag"
"io/ioutil"
"net/http"
"os"
"os/exec"
"strings"
"testing"
"time"
_ "github.com/ncw/rclone/backend/local"
"github.com/ncw/rclone/cmd/serve/httplib"
"github.com/ncw/rclone/fs"
"github.com/ncw/rclone/fs/filter"
"github.com/ncw/rclone/fstest"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"golang.org/x/net/webdav"
)
@ -78,3 +86,185 @@ func TestWebDav(t *testing.T) {
}
assert.NoError(t, err, "Running webdav integration tests")
}
// Test serve http functionality in serve webdav
// While similar to http serve, there are some inconsistencies
// in the handling of some requests such as POST requests
var (
updateGolden = flag.Bool("updategolden", false, "update golden files for regression test")
)
func TestHTTPFunction(t *testing.T) {
// cd to correct directory for testing
err := os.Chdir("../../cmd/serve/webdav")
assert.NoError(t, err, "failed to cd to webdav cmd directory")
// exclude files called hidden.txt and directories called hidden
require.NoError(t, filter.Active.AddRule("- hidden.txt"))
require.NoError(t, filter.Active.AddRule("- hidden/**"))
// Uses the same test files as http tests but with different golden.
f, err := fs.NewFs("../http/testdata/files")
assert.NoError(t, err)
opt := httplib.DefaultOpt
opt.ListenAddr = testBindAddress
// Start the server
w := newWebDAV(f, &opt)
assert.NoError(t, w.serve())
defer func() {
w.Close()
w.Wait()
}()
testURL := w.Server.URL()
pause := time.Millisecond
i := 0
for ; i < 10; i++ {
resp, err := http.Head(testURL)
if err == nil {
_ = resp.Body.Close()
break
}
// t.Logf("couldn't connect, sleeping for %v: %v", pause, err)
time.Sleep(pause)
pause *= 2
}
if i >= 10 {
t.Fatal("couldn't connect to server")
}
HelpTestGET(t, testURL)
}
// check body against the file, or re-write body if -updategolden is
// set.
func checkGolden(t *testing.T, fileName string, got []byte) {
if *updateGolden {
t.Logf("Updating golden file %q", fileName)
err := ioutil.WriteFile(fileName, got, 0666)
require.NoError(t, err)
} else {
want, err := ioutil.ReadFile(fileName)
require.NoError(t, err, "problem")
wants := strings.Split(string(want), "\n")
gots := strings.Split(string(got), "\n")
assert.Equal(t, wants, gots, fileName)
}
}
func HelpTestGET(t *testing.T, testURL string) {
for _, test := range []struct {
URL string
Status int
Golden string
Method string
Range string
}{
{
URL: "",
Status: http.StatusOK,
Golden: "testdata/golden/index.html",
},
{
URL: "notfound",
Status: http.StatusNotFound,
Golden: "testdata/golden/notfound.html",
},
{
URL: "dirnotfound/",
Status: http.StatusNotFound,
Golden: "testdata/golden/dirnotfound.html",
},
{
URL: "hidden/",
Status: http.StatusNotFound,
Golden: "testdata/golden/hiddendir.html",
},
{
URL: "one%25.txt",
Status: http.StatusOK,
Golden: "testdata/golden/one.txt",
},
{
URL: "hidden.txt",
Status: http.StatusNotFound,
Golden: "testdata/golden/hidden.txt",
},
{
URL: "three/",
Status: http.StatusOK,
Golden: "testdata/golden/three.html",
},
{
URL: "three/a.txt",
Status: http.StatusOK,
Golden: "testdata/golden/a.txt",
},
{
URL: "",
Method: "HEAD",
Status: http.StatusOK,
Golden: "testdata/golden/indexhead.txt",
},
{
URL: "one%25.txt",
Method: "HEAD",
Status: http.StatusOK,
Golden: "testdata/golden/onehead.txt",
},
{
URL: "",
Method: "POST",
Status: http.StatusMethodNotAllowed,
Golden: "testdata/golden/indexpost.txt",
},
{
URL: "one%25.txt",
Method: "POST",
Status: http.StatusOK,
Golden: "testdata/golden/onepost.txt",
},
{
URL: "two.txt",
Status: http.StatusOK,
Golden: "testdata/golden/two.txt",
},
{
URL: "two.txt",
Status: http.StatusPartialContent,
Range: "bytes=2-5",
Golden: "testdata/golden/two2-5.txt",
},
{
URL: "two.txt",
Status: http.StatusPartialContent,
Range: "bytes=0-6",
Golden: "testdata/golden/two-6.txt",
},
{
URL: "two.txt",
Status: http.StatusPartialContent,
Range: "bytes=3-",
Golden: "testdata/golden/two3-.txt",
},
} {
method := test.Method
if method == "" {
method = "GET"
}
req, err := http.NewRequest(method, testURL+test.URL, nil)
require.NoError(t, err)
if test.Range != "" {
req.Header.Add("Range", test.Range)
}
resp, err := http.DefaultClient.Do(req)
require.NoError(t, err)
assert.Equal(t, test.Status, resp.StatusCode, test.Golden)
body, err := ioutil.ReadAll(resp.Body)
require.NoError(t, err)
checkGolden(t, test.Golden, body)
}
}