.

wcfs/testdata/zblk_test_gen.py

@@ -67,7 +67,9 @@ def main():
 
         emit("const blksize = %s" % blksize)
         emit("const z0_oid = %s" % u64(z0._p_oid))
+        emit("const z0_rev = %s" % u64(z0._p_serial))
         emit("const z1_oid = %s" % u64(z1._p_oid))
+        emit("const z1_rev = %s" % u64(z1._p_serial))
         emit("const zf_oid = %s" % u64(zf._p_oid))
 
 

wcfs/zblk_test.go

@@ -28,7 +28,6 @@ package main
 import (
 	"context"
 	"encoding/binary"
-	"fmt"
 	"testing"
 
 	"lab.nexedi.com/kirr/go123/exc"
@@ -47,7 +46,8 @@ func TestZBlk(t *testing.T) {
 	stor, err := zodb.Open(ctx, "testdata/zblk.fs", &zodb.OpenOptions{ReadOnly: true}); X(err)
 	db := zodb.NewDB(stor)
 	defer func() {
-		err := db.Close(); X(err)
+		err := db.Close();	X(err)
+		err  = stor.Close();	X(err)
 	}()
 
 	txn, ctx := transaction.New(ctx)
@@ -55,8 +55,6 @@ func TestZBlk(t *testing.T) {
 
 	conn, err := db.Open(ctx, &zodb.ConnOptions{});	X(err)
 
-	// XXX close db/stor
-
 	xz0, err := conn.Get(ctx, z0_oid);	X(err)
 	xz1, err := conn.Get(ctx, z1_oid);	X(err)
 	xzf, err := conn.Get(ctx, zf_oid);	X(err)
@@ -89,14 +87,13 @@ func TestZBlk(t *testing.T) {
 		binary.BigEndian.PutUint32(data[i*4:], i)
 	}
 
-	z0Data, _, err := z0.loadBlkData(ctx);	X(err)	// FIXME check rev
-	assert.Equal(z0Data, data, "ZBlk0 data wrong")
+	z0Data, z0Rev, err := z0.loadBlkData(ctx);	X(err)
+	assert.Equal(z0Data, data,   "ZBlk0 data wrong")
+	assert.Equal(z0Rev,  z0_rev, "ZBlk0 rev wrong")
 
-	z1Data, _, err := z1.loadBlkData(ctx);	X(err)	// FIXME check rev
-	if false {
-		fmt.Printf("%#v\n", z1Data)
-	}
-	assert.Equal(z1Data[:20], data[:20], "ZBlk1 data wrong")
+	z1Data, z1Rev, err := z1.loadBlkData(ctx);	X(err)
+	assert.Equal(z1Data, data,   "ZBlk1 data wrong")
+	assert.Equal(z1Rev,  z1_rev, "ZBlk1 rev wrong")