3826: Tweak memory stat log format to match cpu and net.

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

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 34e711f19758cf0cd15760341516f63dd790113a..0829ce9f92eebfbc7ab77ee78eb4730f36050441 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -591,7 +591,7 @@ func TestDeleteHandler(t *testing.T) {
 //
 // TODO(twp): test concurrency: launch 100 goroutines to update the
 // pull list simultaneously.  Make sure that none of them return 400
-// Bad Request and that pullmgr.GetList() returns a valid list.
+// Bad Request and that pullq.GetList() returns a valid list.
 //
 func TestPullHandler(t *testing.T) {
        defer teardown()
@@ -630,25 +630,25 @@ func TestPullHandler(t *testing.T) {
        }
        var testcases = []pullTest{
                {
-                       "user token, good request",
+                       "Valid pull list from an ordinary user",
                        RequestTester{"/pull", user_token, "PUT", good_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "user token, bad request",
+                       "Invalid pull request from an ordinary user",
                        RequestTester{"/pull", user_token, "PUT", bad_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "data manager token, good request",
+                       "Valid pull request from the data manager",
                        RequestTester{"/pull", data_manager_token, "PUT", good_json},
                        http.StatusOK,
                        "Received 3 pull requests\n",
                },
                {
-                       "data manager token, bad request",
+                       "Invalid pull request from the data manager",
                        RequestTester{"/pull", data_manager_token, "PUT", bad_json},
                        http.StatusBadRequest,
                        "Bad Request\n",
@@ -663,12 +663,119 @@ func TestPullHandler(t *testing.T) {
 
        // The Keep pull manager should have received one good list with 3
        // requests on it.
-       var saved_pull_list = pullmgr.GetList()
-       if len(saved_pull_list) != 3 {
-               t.Errorf(
-                       "saved_pull_list: expected 3 elements, got %d\nsaved_pull_list = %v",
-                       len(saved_pull_list), saved_pull_list)
+       for i := 0; i < 3; i++ {
+               item := <-pullq.NextItem
+               if _, ok := item.(PullRequest); !ok {
+                       t.Errorf("item %v could not be parsed as a PullRequest", item)
+               }
+       }
+
+       expectChannelEmpty(t, pullq.NextItem)
+}
+
+// TestTrashHandler
+//
+// Test cases:
+//
+// Cases tested: syntactically valid and invalid trash lists, from the
+// data manager and from unprivileged users:
+//
+//   1. Valid trash list from an ordinary user
+//      (expected result: 401 Unauthorized)
+//
+//   2. Invalid trash list from an ordinary user
+//      (expected result: 401 Unauthorized)
+//
+//   3. Valid trash list from the data manager
+//      (expected result: 200 OK with request body "Received 3 trash
+//      requests"
+//
+//   4. Invalid trash list from the data manager
+//      (expected result: 400 Bad Request)
+//
+// Test that in the end, the trash collector received a good list
+// trash list with the expected number of requests.
+//
+// TODO(twp): test concurrency: launch 100 goroutines to update the
+// pull list simultaneously.  Make sure that none of them return 400
+// Bad Request and that replica.Dump() returns a valid list.
+//
+func TestTrashHandler(t *testing.T) {
+       defer teardown()
+
+       // Set up a REST router for testing the handlers.
+       rest := MakeRESTRouter()
+
+       var user_token = "USER TOKEN"
+       data_manager_token = "DATA MANAGER TOKEN"
+
+       good_json := []byte(`[
+               {
+                       "locator":"block1",
+                       "block_mtime":1409082153
+               },
+               {
+                       "locator":"block2",
+                       "block_mtime":1409082153
+               },
+               {
+                       "locator":"block3",
+                       "block_mtime":1409082153
+               }
+       ]`)
+
+       bad_json := []byte(`I am not a valid JSON string`)
+
+       type trashTest struct {
+               name          string
+               req           RequestTester
+               response_code int
+               response_body string
+       }
+
+       var testcases = []trashTest{
+               {
+                       "Valid trash list from an ordinary user",
+                       RequestTester{"/trash", user_token, "PUT", good_json},
+                       http.StatusUnauthorized,
+                       "Unauthorized\n",
+               },
+               {
+                       "Invalid trash list from an ordinary user",
+                       RequestTester{"/trash", user_token, "PUT", bad_json},
+                       http.StatusUnauthorized,
+                       "Unauthorized\n",
+               },
+               {
+                       "Valid trash list from the data manager",
+                       RequestTester{"/trash", data_manager_token, "PUT", good_json},
+                       http.StatusOK,
+                       "Received 3 trash requests\n",
+               },
+               {
+                       "Invalid trash list from the data manager",
+                       RequestTester{"/trash", data_manager_token, "PUT", bad_json},
+                       http.StatusBadRequest,
+                       "Bad Request\n",
+               },
+       }
+
+       for _, tst := range testcases {
+               response := IssueRequest(rest, &tst.req)
+               ExpectStatusCode(t, tst.name, tst.response_code, response)
+               ExpectBody(t, tst.name, tst.response_body, response)
        }
+
+       // The trash collector should have received one good list with 3
+       // requests on it.
+       for i := 0; i < 3; i++ {
+               item := <-trashq.NextItem
+               if _, ok := item.(TrashRequest); !ok {
+                       t.Errorf("item %v could not be parsed as a TrashRequest", item)
+               }
+       }
+
+       expectChannelEmpty(t, trashq.NextItem)
 }
 
 // ====================