X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/67f0d86c20139eee996816d44ef75fa52288c515..61a8873440a505d1483a04354b8d1f2089e76e39:/services/keepstore/bufferpool_test.go

diff --git a/services/keepstore/bufferpool_test.go b/services/keepstore/bufferpool_test.go
index b2f63b1abb..bce82377b5 100644
--- a/services/keepstore/bufferpool_test.go
+++ b/services/keepstore/bufferpool_test.go
@@ -2,21 +2,22 @@ package main
 
 import (
 	. "gopkg.in/check.v1"
-	"testing"
 	"time"
 )
 
-// Gocheck boilerplate
-func TestBufferPool(t *testing.T) {
-	TestingT(t)
-}
 var _ = Suite(&BufferPoolSuite{})
-type BufferPoolSuite struct {}
+
+type BufferPoolSuite struct{}
 
 // Initialize a default-sized buffer pool for the benefit of test
 // suites that don't run main().
 func init() {
-	bufs = newBufferPool(maxBuffers, BLOCKSIZE)
+	bufs = newBufferPool(theConfig.MaxBuffers, BlockSize)
+}
+
+// Restore sane default after bufferpool's own tests
+func (s *BufferPoolSuite) TearDownTest(c *C) {
+	bufs = newBufferPool(theConfig.MaxBuffers, BlockSize)
 }
 
 func (s *BufferPoolSuite) TestBufferPoolBufSize(c *C) {
@@ -50,7 +51,7 @@ func testBufferPoolRace(c *C, bufs *bufferPool, unused []byte, expectWin string)
 		race <- "Get"
 	}()
 	go func() {
-		time.Sleep(10*time.Millisecond)
+		time.Sleep(10 * time.Millisecond)
 		bufs.Put(unused)
 		race <- "Put"
 	}()
@@ -81,5 +82,5 @@ func (s *BufferPoolSuite) TestBufferPoolReuse(c *C) {
 		}
 		last = next
 	}
-	c.Check(reuses > allocs * 95/100, Equals, true)
+	c.Check(reuses > allocs*95/100, Equals, true)
 }