db: make checkpoint test even more deterministic

cockroachdb · Oct 3, 2023 · 62251e6 · 62251e6
1 parent c7c47d6
commit 62251e6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/checkpoint_test.go b/checkpoint_test.go
@@ -39,6 +39,7 @@ func TestCheckpoint(t *testing.T) {
 		DisableAutomaticCompactions: true,
 	}
 	opts.private.disableTableStats = true
+	opts.private.testingAlwaysWaitForCleanup = true
 
 	datadriven.RunTest(t, "testdata/checkpoint", func(t *testing.T, td *datadriven.TestData) string {
 		switch td.Cmd {

diff --git a/testdata/checkpoint b/testdata/checkpoint
@@ -704,6 +704,8 @@ sync: checkpoints/checkpoint5/temporary.000020.dbtmp
 close: checkpoints/checkpoint5/temporary.000020.dbtmp
 rename: checkpoints/checkpoint5/temporary.000020.dbtmp -> checkpoints/checkpoint5/OPTIONS-000020
 sync: checkpoints/checkpoint5
+remove: checkpoints/checkpoint5/000008.log
+remove: checkpoints/checkpoint5/OPTIONS-000003
 
 print-backing checkpoints/checkpoint5
 ----
@@ -792,6 +794,8 @@ sync: checkpoints/checkpoint6/temporary.000020.dbtmp
 close: checkpoints/checkpoint6/temporary.000020.dbtmp
 rename: checkpoints/checkpoint6/temporary.000020.dbtmp -> checkpoints/checkpoint6/OPTIONS-000020
 sync: checkpoints/checkpoint6
+remove: checkpoints/checkpoint6/000008.log
+remove: checkpoints/checkpoint6/OPTIONS-000003
 
 print-backing checkpoints/checkpoint6
 ----