5095: Record mtime() from group#contents

[arvados.git] / services / keepstore / handler_test.go

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index fbf4ef32521742e8f60d59814d696200eba80db6..05b410c97dd28c74cdb5e4639c15572497975a89 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -81,10 +81,11 @@ func TestGetHandler(t *testing.T) {
                "Unauthenticated request, unsigned locator",
                string(TEST_BLOCK),
                response)
-       received_xbs := response.Header().Get("X-Block-Size")
-       expected_xbs := fmt.Sprintf("%d", len(TEST_BLOCK))
-       if received_xbs != expected_xbs {
-               t.Errorf("expected X-Block-Size %s, got %s", expected_xbs, received_xbs)
+
+       received_cl := response.Header().Get("Content-Length")
+       expected_cl := fmt.Sprintf("%d", len(TEST_BLOCK))
+       if received_cl != expected_cl {
+               t.Errorf("expected Content-Length %s, got %s", expected_cl, received_cl)
        }
 
        // ----------------
@@ -102,10 +103,11 @@ func TestGetHandler(t *testing.T) {
                "Authenticated request, signed locator", http.StatusOK, response)
        ExpectBody(t,
                "Authenticated request, signed locator", string(TEST_BLOCK), response)
-       received_xbs = response.Header().Get("X-Block-Size")
-       expected_xbs = fmt.Sprintf("%d", len(TEST_BLOCK))
-       if received_xbs != expected_xbs {
-               t.Errorf("expected X-Block-Size %s, got %s", expected_xbs, received_xbs)
+
+       received_cl = response.Header().Get("Content-Length")
+       expected_cl = fmt.Sprintf("%d", len(TEST_BLOCK))
+       if received_cl != expected_cl {
+               t.Errorf("expected Content-Length %s, got %s", expected_cl, received_cl)
        }
 
        // Authenticated request, unsigned locator
@@ -276,10 +278,10 @@ func TestIndexHandler(t *testing.T) {
        // -------------------------------------------------------------
        // Only the superuser should be allowed to issue /index requests.
 
-  // ---------------------------
-  // enforce_permissions enabled
+       // ---------------------------
+       // enforce_permissions enabled
        // This setting should not affect tests passing.
-  enforce_permissions = true
+       enforce_permissions = true
 
        // unauthenticated /index request
        // => UnauthorizedError
@@ -334,8 +336,6 @@ func TestIndexHandler(t *testing.T) {
                http.StatusOK,
                response)
 
-
-
        expected := `^` + TEST_HASH + `\+\d+ \d+\n` +
                TEST_HASH_2 + `\+\d+ \d+\n$`
        match, _ := regexp.MatchString(expected, response.Body.String())
@@ -731,8 +731,8 @@ func IssueRequest(rt *RequestTester) *httptest.ResponseRecorder {
        if rt.api_token != "" {
                req.Header.Set("Authorization", "OAuth2 "+rt.api_token)
        }
-  routerWrapper := MakeRESTRouterWrapper()
-  routerWrapper.ServeHTTP(response, req)
+       loggingRouter := MakeLoggingRESTRouter()
+       loggingRouter.ServeHTTP(response, req)
        return response
 }