.

go/zodb/storage/fs1/fs1tools/dump_test.go

-// Copyright (C) 2017  Nexedi SA and Contributors.
-//                     Kirill Smelkov <kirr@nexedi.com>
+// Copyright (C) 2017-2021  Nexedi SA and Contributors.
+//                          Kirill Smelkov <kirr@nexedi.com>
 //
 // This program is free software: you can Use, Study, Modify and Redistribute
 // it under the terms of the GNU General Public License version 3, or (at your
@@ -31,6 +31,10 @@ package fs1tools
 //go:generate sh -c "python2 -c 'from ZODB.FileStorage import fsdump; fsdump.main()' ../testdata/empty.fs >testdata/empty.fsdump.ok"
 //go:generate sh -c "python2 -c 'from ZODB.FileStorage.fsdump import Dumper; import sys; d = Dumper(sys.argv[1]); d.dump()' ../testdata/empty.fs >testdata/empty.fsdumpv.ok"
 
+//go:generate sh -c "python2 -m ZODB.scripts.fstail -n 1000000 ../testdata/whiteout.fs >testdata/whiteout.fstail.ok"
+//go:generate sh -c "python2 -c 'from ZODB.FileStorage import fsdump; fsdump.main()' ../testdata/whiteout.fs >testdata/whiteout.fsdump.ok"
+//go:generate sh -c "python2 -c 'from ZODB.FileStorage.fsdump import Dumper; import sys; d = Dumper(sys.argv[1]); d.dump()' ../testdata/whiteout.fs >testdata/whiteout.fsdumpv.ok"
+
 import (
 	"bytes"
 	"fmt"
@@ -50,10 +54,11 @@ func loadFile(t *testing.T, path string) string {
 	return string(data)
 }
 
-func testDump(t *testing.T, dir fs1.IterDir, d Dumper) {
-	testv := []string{"1", "empty"}
+func testDump(t *testing.T, dir fs1.IterDir, newd func() Dumper) {
+	testv := []string{"1", "empty", "whiteout"}
 	for _, tt := range testv {
 		t.Run("db=" + tt, func(t *testing.T) {
+			d   := newd()
 			buf := bytes.Buffer{}
 
 			err := Dump(&buf, fmt.Sprintf("../testdata/%s.fs", tt), dir, d)
@@ -70,9 +75,13 @@ func testDump(t *testing.T, dir fs1.IterDir, d Dumper) {
 	}
 }
 
-func TestFsDump(t *testing.T)	{ testDump(t, fs1.IterForward,  &DumperFsDump{}) }
-func TestFsDumpv(t *testing.T)	{ testDump(t, fs1.IterForward,  &DumperFsDumpVerbose{}) }
-func TestFsTail(t *testing.T)	{ testDump(t, fs1.IterBackward, &DumperFsTail{Ntxn: 1000000}) }
+func newFsDump()  Dumper { return &DumperFsDump{} }
+func newFsDumpv() Dumper { return &DumperFsDumpVerbose{} }
+func newFsTail()  Dumper { return &DumperFsTail{Ntxn: 1000000} }
+
+func TestFsDump(t *testing.T)	{ testDump(t, fs1.IterForward,  newFsDump) }
+func TestFsDumpv(t *testing.T)	{ testDump(t, fs1.IterForward,  newFsDumpv) }
+func TestFsTail(t *testing.T)	{ testDump(t, fs1.IterBackward, newFsTail) }
 
 func BenchmarkTail(b *testing.B) {
 	// FIXME small testdata/1.fs is not representative for benchmarking

go/zodb/storage/fs1/fs1tools/testdata/whiteout.fsdump.ok

+Trans #00000 tid=0000000000000017 time=1900-01-01 00:00:00.000000 offset=27
+    status=' ' user='' description=''
+  data #00000 oid=0000000000000001 class=undo or abort of object creation

go/zodb/storage/fs1/fs1tools/testdata/whiteout.fsdumpv.ok

+************************************************************
+file identifier: 'FS21'
+============================================================
+offset: 4
+end pos: 77
+transaction id: 0000000000000017
+trec len: 73
+status: ' '
+user: ''
+description: ''
+len(extra): 0
+------------------------------------------------------------
+offset: 27
+oid: 0000000000000001
+revid: 0000000000000017
+previous record offset: 0
+transaction offset: 4
+len(data): 0
+backpointer: 0
+redundant trec len: 73

go/zodb/storage/fs1/fs1tools/testdata/whiteout.fstail.ok

+1900-01-01 00:00:00.000000: hash=e3e0ff6c686f2fa02266e744f6629d592d432061
+user='' description='' length=73 offset=4 (+23)
+