projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arvbox uses keep config file instead of cli switches. no issue #
[arvados.git]
/
services
/
keep-web
/
handler_test.go
diff --git
a/services/keep-web/handler_test.go
b/services/keep-web/handler_test.go
index 06401f4825e29595bbefa3b9db368c1576ad2e56..68ed062160401e59bb79479c71fbfde21a2495e1 100644
(file)
--- a/
services/keep-web/handler_test.go
+++ b/
services/keep-web/handler_test.go
@@
-29,7
+29,7
@@
type UnitSuite struct{}
func (s *UnitSuite) TestCORSPreflight(c *check.C) {
h := handler{Config: DefaultConfig()}
func (s *UnitSuite) TestCORSPreflight(c *check.C) {
h := handler{Config: DefaultConfig()}
- u
, _ := url.Parse
("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo")
+ u
:= mustParseURL
("http://keep-web.example/c=" + arvadostest.FooCollection + "/foo")
req := &http.Request{
Method: "OPTIONS",
Host: u.Host,
req := &http.Request{
Method: "OPTIONS",
Host: u.Host,
@@
-70,8
+70,7
@@
func (s *UnitSuite) TestInvalidUUID(c *check.C) {
"http://" + bogusID + ".keep-web/t=" + token + "/" + bogusID + "/foo",
} {
c.Log(trial)
"http://" + bogusID + ".keep-web/t=" + token + "/" + bogusID + "/foo",
} {
c.Log(trial)
- u, err := url.Parse(trial)
- c.Assert(err, check.IsNil)
+ u := mustParseURL(trial)
req := &http.Request{
Method: "GET",
Host: u.Host,
req := &http.Request{
Method: "GET",
Host: u.Host,
@@
-513,7
+512,7
@@
func (s *IntegrationSuite) testVhostRedirectTokenToCookie(c *check.C, method, ho
if resp.Code != http.StatusSeeOther {
return resp
}
if resp.Code != http.StatusSeeOther {
return resp
}
- c.Check(resp.Body.String(), check.Matches, `.*href="//`+regexp.QuoteMeta(html.EscapeString(hostPath))+`(\?[^"]*)?".*`)
+ c.Check(resp.Body.String(), check.Matches, `.*href="
http:
//`+regexp.QuoteMeta(html.EscapeString(hostPath))+`(\?[^"]*)?".*`)
cookies := (&http.Response{Header: resp.Header()}).Cookies()
u, _ = u.Parse(resp.Header().Get("Location"))
cookies := (&http.Response{Header: resp.Header()}).Cookies()
u, _ = u.Parse(resp.Header().Get("Location"))
@@
-666,7
+665,7
@@
func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
- Header:
trial.header
,
+ Header:
copyHeader(trial.header)
,
}
s.testServer.Handler.ServeHTTP(resp, req)
var cookies []*http.Cookie
}
s.testServer.Handler.ServeHTTP(resp, req)
var cookies []*http.Cookie
@@
-677,7
+676,7
@@
func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
- Header:
trial.header
,
+ Header:
copyHeader(trial.header)
,
}
cookies = append(cookies, (&http.Response{Header: resp.Header()}).Cookies()...)
for _, c := range cookies {
}
cookies = append(cookies, (&http.Response{Header: resp.Header()}).Cookies()...)
for _, c := range cookies {
@@
-705,7
+704,7
@@
func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
- Header:
trial.header
,
+ Header:
copyHeader(trial.header)
,
Body: ioutil.NopCloser(&bytes.Buffer{}),
}
resp = httptest.NewRecorder()
Body: ioutil.NopCloser(&bytes.Buffer{}),
}
resp = httptest.NewRecorder()
@@
-721,7
+720,7
@@
func (s *IntegrationSuite) TestDirectoryListing(c *check.C) {
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
Host: u.Host,
URL: u,
RequestURI: u.RequestURI(),
- Header:
trial.header
,
+ Header:
copyHeader(trial.header)
,
Body: ioutil.NopCloser(&bytes.Buffer{}),
}
resp = httptest.NewRecorder()
Body: ioutil.NopCloser(&bytes.Buffer{}),
}
resp = httptest.NewRecorder()
@@
-757,3
+756,11
@@
func (s *IntegrationSuite) TestHealthCheckPing(c *check.C) {
c.Check(resp.Code, check.Equals, http.StatusOK)
c.Check(resp.Body.String(), check.Matches, `{"health":"OK"}\n`)
}
c.Check(resp.Code, check.Equals, http.StatusOK)
c.Check(resp.Body.String(), check.Matches, `{"health":"OK"}\n`)
}
+
+func copyHeader(h http.Header) http.Header {
+ hc := http.Header{}
+ for k, v := range h {
+ hc[k] = append([]string(nil), v...)
+ }
+ return hc
+}