projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
13493: Check forwarded token.
[arvados.git]
/
lib
/
controller
/
handler_test.go
diff --git
a/lib/controller/handler_test.go
b/lib/controller/handler_test.go
index dcd4d26a3bb00e59dd665f47925b57f1de866319..c132b659dad64ef192efdd885de262859cc541b2 100644
(file)
--- a/
lib/controller/handler_test.go
+++ b/
lib/controller/handler_test.go
@@
-35,14
+35,14
@@
type HandlerSuite struct {
func (s *HandlerSuite) SetUpTest(c *check.C) {
s.cluster = &arvados.Cluster{
ClusterID: "zzzzz",
func (s *HandlerSuite) SetUpTest(c *check.C) {
s.cluster = &arvados.Cluster{
ClusterID: "zzzzz",
-
SystemNodes: map[string]arvados.SystemNod
e{
+
NodeProfiles: map[string]arvados.NodeProfil
e{
"*": {
Controller: arvados.SystemServiceInstance{Listen: ":"},
"*": {
Controller: arvados.SystemServiceInstance{Listen: ":"},
- RailsAPI: arvados.SystemServiceInstance{Listen: os.Getenv("ARVADOS_
API_HOST"), TLS
: true},
+ RailsAPI: arvados.SystemServiceInstance{Listen: os.Getenv("ARVADOS_
TEST_API_HOST"), TLS: true, Insecure
: true},
},
},
}
},
},
}
- node := s.cluster.
SystemNod
es["*"]
+ node := s.cluster.
NodeProfil
es["*"]
s.handler = newHandler(s.cluster, &node)
}
s.handler = newHandler(s.cluster, &node)
}
@@
-70,7
+70,7
@@
func (s *HandlerSuite) TestRequestTimeout(c *check.C) {
err := json.Unmarshal(resp.Body.Bytes(), &jresp)
c.Check(err, check.IsNil)
c.Assert(len(jresp.Errors), check.Equals, 1)
err := json.Unmarshal(resp.Body.Bytes(), &jresp)
c.Check(err, check.IsNil)
c.Assert(len(jresp.Errors), check.Equals, 1)
- c.Check(jresp.Errors[0], check.Matches, `.*context deadline exceeded`)
+ c.Check(jresp.Errors[0], check.Matches, `.*context deadline exceeded
.*
`)
}
func (s *HandlerSuite) TestProxyWithoutToken(c *check.C) {
}
func (s *HandlerSuite) TestProxyWithoutToken(c *check.C) {
@@
-101,6
+101,7
@@
func (s *HandlerSuite) TestProxyWithTokenInRequestBody(c *check.C) {
"_method": {"GET"},
"api_token": {arvadostest.ActiveToken},
}.Encode()))
"_method": {"GET"},
"api_token": {arvadostest.ActiveToken},
}.Encode()))
+ req.Header.Set("Content-type", "application/x-www-form-urlencoded")
resp := httptest.NewRecorder()
s.handler.ServeHTTP(resp, req)
c.Check(resp.Code, check.Equals, http.StatusOK)
resp := httptest.NewRecorder()
s.handler.ServeHTTP(resp, req)
c.Check(resp.Code, check.Equals, http.StatusOK)