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 55281764cdd595bf68434312f4cb9e9401936bd6..0829ce9f92eebfbc7ab77ee78eb4730f36050441 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -630,25 +630,25 @@ func TestPullHandler(t *testing.T) {
        }
        var testcases = []pullTest{
                {
-                       "pull: user token, good request",
+                       "Valid pull list from an ordinary user",
                        RequestTester{"/pull", user_token, "PUT", good_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "pull: user token, bad request",
+                       "Invalid pull request from an ordinary user",
                        RequestTester{"/pull", user_token, "PUT", bad_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "pull: 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",
                },
                {
-                       "pull: 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,15 +663,14 @@ func TestPullHandler(t *testing.T) {
 
        // The Keep pull manager should have received one good list with 3
        // requests on it.
-       var output_list = make([]PullRequest, 3)
        for i := 0; i < 3; i++ {
                item := <-pullq.NextItem
-               if pr, ok := item.(PullRequest); ok {
-                       output_list[i] = pr
-               } else {
+               if _, ok := item.(PullRequest); !ok {
                        t.Errorf("item %v could not be parsed as a PullRequest", item)
                }
        }
+
+       expectChannelEmpty(t, pullq.NextItem)
 }
 
 // TestTrashHandler
@@ -736,25 +735,25 @@ func TestTrashHandler(t *testing.T) {
 
        var testcases = []trashTest{
                {
-                       "trash: user token, good request",
+                       "Valid trash list from an ordinary user",
                        RequestTester{"/trash", user_token, "PUT", good_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "trash: user token, bad request",
+                       "Invalid trash list from an ordinary user",
                        RequestTester{"/trash", user_token, "PUT", bad_json},
                        http.StatusUnauthorized,
                        "Unauthorized\n",
                },
                {
-                       "trash: data manager token, good request",
+                       "Valid trash list from the data manager",
                        RequestTester{"/trash", data_manager_token, "PUT", good_json},
                        http.StatusOK,
                        "Received 3 trash requests\n",
                },
                {
-                       "trash: data manager token, bad request",
+                       "Invalid trash list from the data manager",
                        RequestTester{"/trash", data_manager_token, "PUT", bad_json},
                        http.StatusBadRequest,
                        "Bad Request\n",
@@ -769,15 +768,14 @@ func TestTrashHandler(t *testing.T) {
 
        // The trash collector should have received one good list with 3
        // requests on it.
-       var output_list = make([]TrashRequest, 3)
        for i := 0; i < 3; i++ {
                item := <-trashq.NextItem
-               if tr, ok := item.(TrashRequest); ok {
-                       output_list[i] = tr
-               } else {
+               if _, ok := item.(TrashRequest); !ok {
                        t.Errorf("item %v could not be parsed as a TrashRequest", item)
                }
        }
+
+       expectChannelEmpty(t, trashq.NextItem)
 }
 
 // ====================