.

wcfs/testdata/zblk_test_gen.py

@@ -75,6 +75,7 @@ def main2():
         emit('import "lab.nexedi.com/kirr/neo/go/zodb"\n')
 
         emit("const zf_blksize = %d" % zf.blksize)
+        emit("const zf_size    = %d" % ((zf.blktab.maxKey()+1)*zf.blksize))
         emit("const z0_oid     = zodb.Oid(%d)" % u64(z0._p_oid))
         emit("const z1_oid     = zodb.Oid(%d)" % u64(z1._p_oid))
         emit("const zf_oid     = zodb.Oid(%d)" % u64(zf._p_oid))

wcfs/zblk_test.go

@@ -89,12 +89,11 @@ func TestZBlk(t *testing.T) {
 	z1DataOK := make([]byte, zf_blksize)                                  // zeros
 	copy(z1DataOK[0:],                      brange32(z1_htlen))           // head
 	copy(z1DataOK[len(z1DataOK)-z1_htlen:], breverse(brange32(z1_htlen))) // tail
-	z1DataOK = bytes.TrimRight(z1DataOK, "\x00") // strip trailing 0 as they are not persisted
+	z1DataOK = bytes.TrimRight(z1DataOK, "\x00") // trailing 0 are not persisted
 	assert.Equal(z1Data, z1DataOK,   "ZBlk1 data wrong")
 	assert.Equal(z1Rev,  z1_rev,     "ZBlk1 rev wrong")
 
 
-
 	xactivate(zf)
 	if zf.blksize != zf_blksize {
 		t.Fatalf("zf: blksize=%d;  want %d", zf.blksize, zf_blksize)
@@ -105,11 +104,14 @@ func TestZBlk(t *testing.T) {
 		t.Fatalf("zf: [0] -> %#v; want z0", z0_)
 	}
 
-	z1_, ok, err := zf.blktab.Get(ctx,1);	X(err)
+	z1_, ok, err := zf.blktab.Get(ctx, 1);	X(err)
 	if !(ok && z1_ == z1) {
 		t.Fatalf("zf: [1] -> %#v; want z1", z1_)
 	}
 
+	size, _, err := zf.Size(ctx);	X(err)
+	assert.Equal(size, int64(zf_size),	"ZBigFile size wrong")
+
 	// XXX check zf.blktab.MaxKey ?
 
 	// XXX check zf.LoadBlk()

wcfs/ztestdata_zblk_test.go

@@ -4,6 +4,7 @@ package main
 import "lab.nexedi.com/kirr/neo/go/zodb"
 
 const zf_blksize = 2097152
+const zf_size    = 4194304
 const z0_oid     = zodb.Oid(2)
 const z1_oid     = zodb.Oid(3)
 const zf_oid     = zodb.Oid(1)