X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/dab0c5596e39dc455d88bba797717e829fe5caf5..35db495717a628e0a6ef52a453b8d8ced793c41b:/sdk/go/arvados/fs_collection_test.go

diff --git a/sdk/go/arvados/fs_collection_test.go b/sdk/go/arvados/fs_collection_test.go
index c2cac3c6ce..73689e4ead 100644
--- a/sdk/go/arvados/fs_collection_test.go
+++ b/sdk/go/arvados/fs_collection_test.go
@@ -1209,11 +1209,12 @@ func (s *CollectionFSSuite) TestFlushFullBlocksOnly(c *check.C) {
 	}
 
 	nDirs := int64(8)
+	nFiles := int64(67)
 	megabyte := make([]byte, 1<<20)
 	for i := int64(0); i < nDirs; i++ {
 		dir := fmt.Sprintf("dir%d", i)
 		fs.Mkdir(dir, 0755)
-		for j := 0; j < 67; j++ {
+		for j := int64(0); j < nFiles; j++ {
 			f, err := fs.OpenFile(fmt.Sprintf("%s/file%d", dir, j), os.O_WRONLY|os.O_CREATE, 0)
 			c.Assert(err, check.IsNil)
 			defer f.Close()
@@ -1221,8 +1222,8 @@ func (s *CollectionFSSuite) TestFlushFullBlocksOnly(c *check.C) {
 			c.Assert(err, check.IsNil)
 		}
 	}
-	inodebytes := int64((nDirs*(67*2+1) + 1) * 64)
-	c.Check(fs.MemorySize(), check.Equals, int64(nDirs*67<<20)+inodebytes)
+	inodebytes := int64((nDirs*(nFiles+1) + 1) * 64)
+	c.Check(fs.MemorySize(), check.Equals, nDirs*nFiles*(1<<20+64)+inodebytes)
 	c.Check(flushed, check.Equals, int64(0))
 
 	waitForFlush := func(expectUnflushed, expectFlushed int64) {
@@ -1233,27 +1234,29 @@ func (s *CollectionFSSuite) TestFlushFullBlocksOnly(c *check.C) {
 	}
 
 	// Nothing flushed yet
-	waitForFlush((nDirs*67)<<20+inodebytes, 0)
+	waitForFlush(nDirs*nFiles*(1<<20+64)+inodebytes, 0)
 
 	// Flushing a non-empty dir "/" is non-recursive and there are
 	// no top-level files, so this has no effect
 	fs.Flush("/", false)
-	waitForFlush((nDirs*67)<<20+inodebytes, 0)
+	waitForFlush(nDirs*nFiles*(1<<20+64)+inodebytes, 0)
 
 	// Flush the full block in dir0
 	fs.Flush("dir0", false)
-	waitForFlush((nDirs*67-64)<<20+inodebytes, 64<<20)
+	bigloclen := int64(32 + 9 + 51 + 64) // md5 + "+" + "67xxxxxx" + "+Axxxxxx..." + 64 (see (storedSegment)memorySize)
+	waitForFlush((nDirs*nFiles-64)*(1<<20+64)+inodebytes+bigloclen*64, 64<<20)
 
 	err = fs.Flush("dir-does-not-exist", false)
 	c.Check(err, check.NotNil)
 
 	// Flush full blocks in all dirs
 	fs.Flush("", false)
-	waitForFlush(nDirs*3<<20+inodebytes, nDirs*64<<20)
+	waitForFlush(nDirs*3*(1<<20+64)+inodebytes+bigloclen*64*nDirs, nDirs*64<<20)
 
 	// Flush non-full blocks, too
 	fs.Flush("", true)
-	waitForFlush(inodebytes, nDirs*67<<20)
+	smallloclen := int64(32 + 8 + 51 + 64) // md5 + "+" + "3xxxxxx" + "+Axxxxxx..." + 64 (see (storedSegment)memorySize)
+	waitForFlush(inodebytes+bigloclen*64*nDirs+smallloclen*3*nDirs, nDirs*67<<20)
 }
 
 // Even when writing lots of files/dirs from different goroutines, as