3550: Merge branch 'master' into 3550-local-pipeline

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

diff --git a/services/keepstore/handler_test.go b/services/keepstore/handler_test.go
index 34e711f19758cf0cd15760341516f63dd790113a..deb1c3dd110d146d50efa1e7bd5fc3e8711c5281 100644 (file)
--- a/services/keepstore/handler_test.go
+++ b/services/keepstore/handler_test.go
@@ -663,11 +663,14 @@ 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)
+       var output_list = make([]PullRequest, 3)
+       for i := 0; i < 3; i++ {
+               item := <-pullmgr.NextItem
+               if pr, ok := item.(PullRequest); ok {
+                       output_list[i] = pr
+               } else {
+                       t.Errorf("item %v could not be parsed as a PullRequest", item)
+               }
        }
 }