.

wcfs/δbtail_test.go

@@ -237,9 +237,9 @@ func xverifyΔBTail(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1, at2 zodb.
 		return keyv1[i] < keyv1[j]
 	})
 	for kidx := range IntSets(len(keyv1)) {
-		keys := make([]Key, len(kidx))
-		for i, idx := range kidx {
-			keys[i] = keyv1[idx]
+		keys := SetKey{}
+		for _, idx := range kidx {
+			keys.Add(keyv1[idx])
 		}
 
 		xverifyΔBTail1(t, db, treeRoot, at1,at2, kv1,kv2, d12, δZ, keys)
@@ -248,7 +248,7 @@ func xverifyΔBTail(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1, at2 zodb.
 
 // xverifyΔBTail1 verifies how ΔBTail handles ZODB update at1->at2 from initial
 // tracked state defined by initialTrackedKeys.
-func xverifyΔBTail1(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1,at2 zodb.Tid, kv1,kv2, d12 map[Key]string, δZ *zodb.EventCommit, initialTrackedKeys []Key) {
+func xverifyΔBTail1(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1,at2 zodb.Tid, kv1,kv2, d12 map[Key]string, δZ *zodb.EventCommit, initialTrackedKeys SetKey) {
 	X := exc.Raiseif
 	assert := require.New(t)
 	fmt.Println("verify1", initialTrackedKeys)
@@ -263,7 +263,7 @@ func xverifyΔBTail1(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1,at2 zodb.
 	xtree, err := zconn.Get(ctx, treeRoot);	X(err)
 	ztree := xtree.(*Tree)
 
-	for _, k := range initialTrackedKeys {
+	for k := range initialTrackedKeys {
 		path := []Node{}
 		_, _, err = ztree.VGet(ctx, k, func(node Node) {
 			path = append(path, node)
@@ -309,28 +309,28 @@ func xverifyΔBTail1(t *testing.T, db *zodb.DB, treeRoot zodb.Oid, at1,at2 zodb.
 	for k := range δT {
 		_, ind12 := d12[k]
 		if ind12 {
-			badf("δT: extra key %s", k)
+			badf("δT: [%v] is extra", k)
 		}
 	}
 
 	// k ∈ tracked set ->  must be present in δT
 	// k ∉ tracked set ->  may  be present in δT
-	for k,v := range d12 {
+	for k := range d12 {
 		_, inδT := δT[k]
 		if initialTrackedKeys.Has(k) {
 			if !inδT {
-				badf("δT: missing key %s", k)
+				badf("δT: [%v] is missing", k)
 			}
 		}
 		if inδT {
 			if δT[k] != d12[k] {
-				badf("δT[%s] != d12[%s]", k, k)
+				badf("δT[%v] != d12[%v]", k, k)
 			}
 		}
 	}
 
 	if badv != nil {
-		emsg := fmt.Sprintf("d12: %v\nδT: %v\n\n", d12, δT)
+		emsg := fmt.Sprintf("δT is wrong:\n\nd12: %v\nδT:  %v\n\n", d12, δT)
 		emsg += strings.Join(badv, "\n")
 		t.Fatal(emsg)
 	}