Merge branch '9437-keep-index-ns'

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

diff --git a/services/keepstore/work_queue_test.go b/services/keepstore/work_queue_test.go
index 7844a2b87cde29546239f505dc5cf949781f87ab..6b31795293ebd38eaa3837316fe001519c91b072 100644 (file)
--- a/services/keepstore/work_queue_test.go
+++ b/services/keepstore/work_queue_test.go
@@ -59,7 +59,7 @@ func doWorkItems(t fatalfer, q *WorkQueue, expected []int) {
                if !ok {
                        t.Fatalf("Expected %+v but channel was closed after receiving %+v as expected.", expected, expected[:i])
                }
-               q.ReportDone <- struct{}{}
+               q.DoneItem <- struct{}{}
                if actual.(int) != expected[i] {
                        t.Fatalf("Expected %+v but received %+v after receiving %+v as expected.", expected[i], actual, expected[:i])
                }
@@ -98,10 +98,10 @@ func TestWorkQueueDoneness(t *testing.T) {
        gate := make(chan struct{})
        go func() {
                <-gate
-               for _ = range b.NextItem {
+               for range b.NextItem {
                        <-gate
                        time.Sleep(time.Millisecond)
-                       b.ReportDone <- struct{}{}
+                       b.DoneItem <- struct{}{}
                }
        }()
        expectEqualWithin(t, time.Second, 0, func() interface{} { return b.Status().InProgress })
@@ -167,7 +167,7 @@ func TestWorkQueueClose(t *testing.T) {
                <-b.NextItem
                mark <- struct{}{}
                <-mark
-               b.ReportDone <- struct{}{}
+               b.DoneItem <- struct{}{}
        }()
        b.ReplaceQueue(makeTestWorkList(input))
        // Wait for worker to take item 1