X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/64efd1030538d59821ce288a7674e29d49c35744..8a27fe370239ecb8e50d53f46b45ed61203a35ca:/services/keepstore/bufferpool_test.go

diff --git a/services/keepstore/bufferpool_test.go b/services/keepstore/bufferpool_test.go
index bce82377b5..13e1cb4f33 100644
--- a/services/keepstore/bufferpool_test.go
+++ b/services/keepstore/bufferpool_test.go
@@ -1,8 +1,15 @@
-package main
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+package keepstore
 
 import (
-	. "gopkg.in/check.v1"
+	"context"
 	"time"
+
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
+	. "gopkg.in/check.v1"
 )
 
 var _ = Suite(&BufferPoolSuite{})
@@ -12,16 +19,16 @@ type BufferPoolSuite struct{}
 // Initialize a default-sized buffer pool for the benefit of test
 // suites that don't run main().
 func init() {
-	bufs = newBufferPool(theConfig.MaxBuffers, BlockSize)
+	bufs = newBufferPool(ctxlog.FromContext(context.Background()), 12, BlockSize)
 }
 
 // Restore sane default after bufferpool's own tests
 func (s *BufferPoolSuite) TearDownTest(c *C) {
-	bufs = newBufferPool(theConfig.MaxBuffers, BlockSize)
+	bufs = newBufferPool(ctxlog.FromContext(context.Background()), 12, BlockSize)
 }
 
 func (s *BufferPoolSuite) TestBufferPoolBufSize(c *C) {
-	bufs := newBufferPool(2, 10)
+	bufs := newBufferPool(ctxlog.TestLogger(c), 2, 10)
 	b1 := bufs.Get(1)
 	bufs.Get(2)
 	bufs.Put(b1)
@@ -30,14 +37,14 @@ func (s *BufferPoolSuite) TestBufferPoolBufSize(c *C) {
 }
 
 func (s *BufferPoolSuite) TestBufferPoolUnderLimit(c *C) {
-	bufs := newBufferPool(3, 10)
+	bufs := newBufferPool(ctxlog.TestLogger(c), 3, 10)
 	b1 := bufs.Get(10)
 	bufs.Get(10)
 	testBufferPoolRace(c, bufs, b1, "Get")
 }
 
 func (s *BufferPoolSuite) TestBufferPoolAtLimit(c *C) {
-	bufs := newBufferPool(2, 10)
+	bufs := newBufferPool(ctxlog.TestLogger(c), 2, 10)
 	b1 := bufs.Get(10)
 	bufs.Get(10)
 	testBufferPoolRace(c, bufs, b1, "Put")
@@ -61,7 +68,7 @@ func testBufferPoolRace(c *C, bufs *bufferPool, unused []byte, expectWin string)
 }
 
 func (s *BufferPoolSuite) TestBufferPoolReuse(c *C) {
-	bufs := newBufferPool(2, 10)
+	bufs := newBufferPool(ctxlog.TestLogger(c), 2, 10)
 	bufs.Get(10)
 	last := bufs.Get(10)
 	// The buffer pool is allowed to throw away unused buffers