projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14738: Enhances code readability when concatenating strings.
[arvados.git]
/
services
/
keepstore
/
handler_test.go
diff --git
a/services/keepstore/handler_test.go
b/services/keepstore/handler_test.go
index 4d042a70dd376ea1e04bdff16283ab80669dfd0f..c37a4d112fb8b86aaa076431f08524930ce83d0b 100644
(file)
--- a/
services/keepstore/handler_test.go
+++ b/
services/keepstore/handler_test.go
@@
-30,6
+30,10
@@
import (
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
)
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
)
+var testCluster = &arvados.Cluster{
+ ClusterID: "zzzzz",
+}
+
// A RequestTester represents the parameters for an HTTP request to
// be issued on behalf of a unit test.
type RequestTester struct {
// A RequestTester represents the parameters for an HTTP request to
// be issued on behalf of a unit test.
type RequestTester struct {
@@
-823,7
+827,7
@@
func IssueRequest(rt *RequestTester) *httptest.ResponseRecorder {
if rt.apiToken != "" {
req.Header.Set("Authorization", "OAuth2 "+rt.apiToken)
}
if rt.apiToken != "" {
req.Header.Set("Authorization", "OAuth2 "+rt.apiToken)
}
- loggingRouter := MakeRESTRouter()
+ loggingRouter := MakeRESTRouter(
testCluster
)
loggingRouter.ServeHTTP(response, req)
return response
}
loggingRouter.ServeHTTP(response, req)
return response
}
@@
-835,7
+839,7
@@
func IssueHealthCheckRequest(rt *RequestTester) *httptest.ResponseRecorder {
if rt.apiToken != "" {
req.Header.Set("Authorization", "Bearer "+rt.apiToken)
}
if rt.apiToken != "" {
req.Header.Set("Authorization", "Bearer "+rt.apiToken)
}
- loggingRouter := MakeRESTRouter()
+ loggingRouter := MakeRESTRouter(
testCluster
)
loggingRouter.ServeHTTP(response, req)
return response
}
loggingRouter.ServeHTTP(response, req)
return response
}
@@
-975,7
+979,7
@@
func TestGetHandlerClientDisconnect(t *testing.T) {
ok := make(chan struct{})
go func() {
req, _ := http.NewRequest("GET", fmt.Sprintf("/%s+%d", TestHash, len(TestBlock)), nil)
ok := make(chan struct{})
go func() {
req, _ := http.NewRequest("GET", fmt.Sprintf("/%s+%d", TestHash, len(TestBlock)), nil)
- MakeRESTRouter().ServeHTTP(resp, req)
+ MakeRESTRouter(
testCluster
).ServeHTTP(resp, req)
ok <- struct{}{}
}()
ok <- struct{}{}
}()
@@
-1107,7
+1111,7
@@
func TestUntrashHandler(t *testing.T) {
response = IssueRequest(datamanagerWrongMethodReq)
ExpectStatusCode(t,
"Only PUT method is supported for untrash",
response = IssueRequest(datamanagerWrongMethodReq)
ExpectStatusCode(t,
"Only PUT method is supported for untrash",
- http.Status
BadRequest
,
+ http.Status
MethodNotAllowed
,
response)
// datamanagerReq => StatusOK
response)
// datamanagerReq => StatusOK