.

wcfs/δbtail_test.go

@@ -501,21 +501,11 @@ func xverifyΔBTail(t *testing.T, subj string, db *zodb.DB, treeRoot zodb.Oid, a
 		ka := SetKey{}
 
 		if k == kInf {
-			// btree grows and maxkey tracked: maxkey from kv2 must be in δT
-			if maxk2 > maxk1 {
-				kb := xkv2.Get(maxk2)
-				for k := range kb.kv { ka.Add(k) }
-				// no xkv1[maxk1]	// XXX correct?
-
-			// btree shrinks and maxkey tracked:
-			} else {
-				// XXX correct?
-				for k := range xkv1.Get(maxk1).kv { ka.Add(k) }
-				for k := range xkv2.Get(maxk2).kv { ka.Add(k) }
-			}
+			for k_ := range xkv1.Get(maxk1).kv { ka.Add(k_) }
+			for k_ := range xkv2.Get(maxk2).kv { ka.Add(k_) }
 		} else {
-			for k := range xkv1.Get(k).kv { ka.Add(k) }
-			for k := range xkv2.Get(k).kv { ka.Add(k) }
+			for k_ := range xkv1.Get(k).kv { ka.Add(k_) }
+			for k_ := range xkv2.Get(k).kv { ka.Add(k_) }
 		}
 
 		kadj[k] = ka
@@ -585,7 +575,7 @@ func xverifyΔBTail1(t *testing.T, subj string, db *zodb.DB, treeRoot zodb.Oid,
 	}
 	trackedNotInKadj.Del(kInf)
 	if len(trackedNotInKadj) > 0 {
-		panic(fmt.Sprintf("BUG: Tracked ∉ kadj[Tracked]")) // XXX more details?
+		panic(fmt.Sprintf("BUG: %s: Tracked ∉ kadj[Tracked]", subj)) // XXX more details?
 	}
 
 	//              k ∈ d12
@@ -1118,5 +1108,5 @@ func (ks SetKey) String() string {
 	for _, k := range keyv {
 		strv = append(strv, fmt.Sprintf("%d", k))
 	}
-	return "{" + strings.Join(strv, ", ") + "}"
+	return "{" + strings.Join(strv, " ") + "}"
 }