Skip to content

Commit 43d95d5

Browse files
jbowensjbowens
committed
internal/testutils: move Logger
Move the testLogger type into testutils and use it in a few additional tests to silence some additional stdout spam.
1 parent 71cce7b commit 43d95d5

24 files changed

+179
-102
lines changed

‎batch_test.go‎

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/cockroachdb/pebble/internal/itertest"
2727
"github.com/cockroachdb/pebble/internal/keyspan"
2828
"github.com/cockroachdb/pebble/internal/testkeys"
29+
"github.com/cockroachdb/pebble/internal/testutils"
2930
"github.com/cockroachdb/pebble/vfs"
3031
"github.com/stretchr/testify/require"
3132
)
@@ -298,7 +299,8 @@ func testBatchEmpty(t *testing.T, size int, opts ...BatchOption) {
298299
b = &Batch{}
299300

300301
d, err := Open("", &Options{
301-
FS: vfs.NewMem(),
302+
FS: vfs.NewMem(),
303+
Logger: testutils.Logger{T: t},
302304
})
303305
require.NoError(t, err)
304306
defer d.Close()
@@ -322,7 +324,8 @@ func testBatchEmpty(t *testing.T, size int, opts ...BatchOption) {
322324

323325
func TestBatchApplyNoSyncWait(t *testing.T) {
324326
db, err := Open("", &Options{
325-
FS: vfs.NewMem(),
327+
FS: vfs.NewMem(),
328+
Logger: testutils.Logger{T: t},
326329
})
327330
require.NoError(t, err)
328331
defer db.Close()
@@ -348,7 +351,8 @@ func TestBatchApplyNoSyncWait(t *testing.T) {
348351

349352
func TestBatchReset(t *testing.T) {
350353
db, err := Open("", &Options{
351-
FS: vfs.NewMem(),
354+
FS: vfs.NewMem(),
355+
Logger: testutils.Logger{T: t},
352356
})
353357
require.NoError(t, err)
354358
defer db.Close()
@@ -419,7 +423,8 @@ func TestBatchReset(t *testing.T) {
419423

420424
func TestBatchReuse(t *testing.T) {
421425
db, err := Open("", &Options{
422-
FS: vfs.NewMem(),
426+
FS: vfs.NewMem(),
427+
Logger: testutils.Logger{T: t},
423428
})
424429
require.NoError(t, err)
425430

@@ -509,7 +514,8 @@ func TestIndexedBatchReset(t *testing.T) {
509514
return count
510515
}
511516
db, err := Open("", &Options{
512-
FS: vfs.NewMem(),
517+
FS: vfs.NewMem(),
518+
Logger: testutils.Logger{T: t},
513519
})
514520
require.NoError(t, err)
515521
defer db.Close()
@@ -595,6 +601,7 @@ func TestIndexedBatchMutation(t *testing.T) {
595601
Comparer: testkeys.Comparer,
596602
FS: vfs.NewMem(),
597603
FormatMajorVersion: internalFormatNewest,
604+
Logger: testutils.Logger{T: t},
598605
}
599606
d, err := Open("", opts)
600607
require.NoError(t, err)
@@ -701,6 +708,7 @@ func TestIndexedBatch_GlobalVisibility(t *testing.T) {
701708
FS: vfs.NewMem(),
702709
FormatMajorVersion: internalFormatNewest,
703710
Comparer: testkeys.Comparer,
711+
Logger: testutils.Logger{T: t},
704712
}
705713
d, err := Open("", opts)
706714
require.NoError(t, err)
@@ -884,6 +892,7 @@ func TestBatchGet(t *testing.T) {
884892
d, err := Open("", &Options{
885893
FS: vfs.NewMem(),
886894
MemTableSize: c.memTableSize,
895+
Logger: testutils.Logger{T: t},
887896
})
888897
if err != nil {
889898
t.Fatalf("Open: %v", err)
@@ -1284,7 +1293,8 @@ func TestEmptyFlushableBatch(t *testing.T) {
12841293
func TestBatchCommitStats(t *testing.T) {
12851294
testFunc := func() error {
12861295
db, err := Open("", &Options{
1287-
FS: vfs.NewMem(),
1296+
FS: vfs.NewMem(),
1297+
Logger: testutils.Logger{T: t},
12881298
})
12891299
require.NoError(t, err)
12901300
defer db.Close()
@@ -1571,9 +1581,9 @@ func BenchmarkIndexedBatchSetDeferred(b *testing.B) {
15711581
}
15721582

15731583
func TestBatchMemTableSizeOverflow(t *testing.T) {
1574-
opts := &Options{
1584+
opts := testingRandomized(t, &Options{
15751585
FS: vfs.NewMem(),
1576-
}
1586+
})
15771587
opts.EnsureDefaults()
15781588
d, err := Open("", opts)
15791589
require.NoError(t, err)
@@ -1599,6 +1609,7 @@ func TestBatchSpanCaching(t *testing.T) {
15991609
Comparer: testkeys.Comparer,
16001610
FS: vfs.NewMem(),
16011611
FormatMajorVersion: internalFormatNewest,
1612+
Logger: testutils.Logger{T: t},
16021613
}
16031614
d, err := Open("", opts)
16041615
require.NoError(t, err)

‎checkpoint_test.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import (
1818

1919
"github.com/cockroachdb/datadriven"
2020
"github.com/cockroachdb/pebble/internal/base"
21+
"github.com/cockroachdb/pebble/internal/testutils"
2122
"github.com/cockroachdb/pebble/objstorage/remote"
2223
"github.com/cockroachdb/pebble/sstable"
2324
"github.com/cockroachdb/pebble/vfs"
@@ -43,7 +44,7 @@ func testCheckpointImpl(t *testing.T, ddFile string, createOnShared bool) {
4344
FormatMajorVersion: internalFormatNewest,
4445
L0CompactionThreshold: 10,
4546
DisableAutomaticCompactions: true,
46-
Logger: testLogger{t},
47+
Logger: testutils.Logger{T: t},
4748
}
4849
opts.Experimental.RemoteStorage = remote.MakeSimpleFactory(map[remote.Locator]remote.Storage{
4950
"": remoteMem,
@@ -287,7 +288,7 @@ func TestCheckpoint(t *testing.T) {
287288

288289
func TestCheckpointCompaction(t *testing.T) {
289290
fs := vfs.NewMem()
290-
d, err := Open("", &Options{FS: fs, Logger: testLogger{t: t}})
291+
d, err := Open("", &Options{FS: fs, Logger: testutils.Logger{T: t}})
291292
require.NoError(t, err)
292293

293294
ctx, cancel := context.WithCancel(context.Background())
@@ -333,7 +334,7 @@ func TestCheckpointCompaction(t *testing.T) {
333334
}
334335
}()
335336
go func() {
336-
opts := &Options{FS: fs, Logger: testLogger{t: t}}
337+
opts := &Options{FS: fs, Logger: testutils.Logger{T: t}}
337338
defer cancel()
338339
defer wg.Done()
339340
for dir := range check {
@@ -370,7 +371,7 @@ func TestCheckpointCompaction(t *testing.T) {
370371
func TestCheckpointFlushWAL(t *testing.T) {
371372
const checkpointPath = "checkpoints/checkpoint"
372373
fs := vfs.NewCrashableMem()
373-
opts := &Options{FS: fs, Logger: testLogger{t: t}}
374+
opts := &Options{FS: fs, Logger: testutils.Logger{T: t}}
374375
key, value := []byte("key"), []byte("value")
375376

376377
// Create a checkpoint from an unsynced DB.
@@ -429,7 +430,7 @@ func TestCheckpointManyFiles(t *testing.T) {
429430
FS: vfs.NewMem(),
430431
FormatMajorVersion: internalFormatNewest,
431432
DisableAutomaticCompactions: true,
432-
Logger: testLogger{t},
433+
Logger: testutils.Logger{T: t},
433434
}
434435
// Disable compression to speed up the test.
435436
opts.EnsureDefaults()

‎compaction_picker_test.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"github.com/cockroachdb/pebble/internal/manifest"
2525
"github.com/cockroachdb/pebble/internal/problemspans"
2626
"github.com/cockroachdb/pebble/internal/testkeys"
27+
"github.com/cockroachdb/pebble/internal/testutils"
2728
"github.com/cockroachdb/pebble/sstable"
2829
"github.com/cockroachdb/pebble/vfs"
2930
"github.com/stretchr/testify/require"
@@ -1320,6 +1321,7 @@ func TestCompactionPickerPickFile(t *testing.T) {
13201321
Comparer: testkeys.Comparer,
13211322
FormatMajorVersion: FormatNewest,
13221323
FS: fs,
1324+
Logger: testutils.Logger{T: t},
13231325
}
13241326
opts.Experimental.CompactionScheduler = NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
13251327

@@ -1463,6 +1465,7 @@ func TestCompactionPickerScores(t *testing.T) {
14631465
DisableAutomaticCompactions: true,
14641466
FormatMajorVersion: FormatNewest,
14651467
FS: fs,
1468+
Logger: testutils.Logger{T: t},
14661469
}
14671470
opts.Experimental.CompactionScheduler = NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
14681471

‎compaction_test.go‎

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,7 @@ func TestAutomaticFlush(t *testing.T) {
576576
DebugCheck: DebugCheckLevels,
577577
FS: mem,
578578
L0CompactionThreshold: 8,
579+
Logger: testutils.Logger{T: t},
579580
MemTableSize: memTableSize,
580581
}
581582
opts = opts.testingRandomized(t)
@@ -922,6 +923,7 @@ func TestCompaction(t *testing.T) {
922923
DisableAutomaticCompactions: true,
923924
EventListener: compactionLogEventListener,
924925
FormatMajorVersion: randVersion(minVersion, maxVersion),
926+
Logger: testutils.Logger{T: t},
925927
}
926928
opts.WithFSDefaults()
927929
opts.Experimental.CompactionScheduler = NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
@@ -1024,6 +1026,7 @@ func TestCompaction(t *testing.T) {
10241026
EventListener: compactionLogEventListener,
10251027
FormatMajorVersion: randVersion(minVersion, maxVersion),
10261028
DisableAutomaticCompactions: true,
1029+
Logger: testutils.Logger{T: t},
10271030
}
10281031
opts.WithFSDefaults()
10291032
opts.Experimental.CompactionScheduler = NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest()
@@ -1587,6 +1590,7 @@ func TestCompactionDeleteOnlyHints(t *testing.T) {
15871590
},
15881591
},
15891592
FormatMajorVersion: internalFormatNewest,
1593+
Logger: testutils.Logger{T: t},
15901594
}
15911595
opts.WithFSDefaults()
15921596
opts.Experimental.EnableDeleteOnlyCompactionExcises = func() bool { return true }
@@ -1896,6 +1900,7 @@ func TestCompactionTombstones(t *testing.T) {
18961900
},
18971901
},
18981902
FormatMajorVersion: internalFormatNewest,
1903+
Logger: testutils.Logger{T: t},
18991904
}
19001905
opts.WithFSDefaults()
19011906
opts.Experimental.EnableDeleteOnlyCompactionExcises = func() bool { return true }
@@ -2103,6 +2108,7 @@ func TestCompactionReadTriggered(t *testing.T) {
21032108
compactInfo = &info
21042109
},
21052110
},
2111+
Logger: testutils.Logger{T: t},
21062112
}
21072113
opts.WithFSDefaults()
21082114
var err error
@@ -2217,7 +2223,7 @@ func TestCompactionAllowZeroSeqNum(t *testing.T) {
22172223
}
22182224

22192225
var err error
2220-
if d, err = runDBDefineCmd(td, nil /* options */); err != nil {
2226+
if d, err = runDBDefineCmd(td, &Options{Logger: testutils.Logger{T: t}}); err != nil {
22212227
return err.Error()
22222228
}
22232229

@@ -2369,6 +2375,7 @@ func TestCompactionErrorCleanup(t *testing.T) {
23692375
}
23702376
},
23712377
},
2378+
Logger: testutils.Logger{T: t},
23722379
}
23732380
opts.WithFSDefaults()
23742381
for i := range opts.TargetFileSizes {
@@ -2551,7 +2558,8 @@ func TestCompactFlushQueuedMemTableAndFlushMetrics(t *testing.T) {
25512558

25522559
mem := vfs.NewMem()
25532560
opts := &Options{
2554-
FS: mem,
2561+
FS: mem,
2562+
Logger: testutils.Logger{T: t},
25552563
}
25562564
opts.WithFSDefaults()
25572565
d, err := Open("", testingRandomized(t, opts))
@@ -2614,7 +2622,8 @@ func TestCompactFlushQueuedLargeBatch(t *testing.T) {
26142622

26152623
mem := vfs.NewMem()
26162624
opts := &Options{
2617-
FS: mem,
2625+
FS: mem,
2626+
Logger: testutils.Logger{T: t},
26182627
}
26192628
opts.WithFSDefaults()
26202629
d, err := Open("", testingRandomized(t, opts))
@@ -2664,6 +2673,7 @@ func TestFlushError(t *testing.T) {
26642673
t.Log(err)
26652674
},
26662675
},
2676+
Logger: testutils.Logger{T: t},
26672677
}
26682678
opts.WithFSDefaults()
26692679
d, err := Open("", testingRandomized(t, opts))
@@ -2718,7 +2728,8 @@ func TestCompactionInvalidBounds(t *testing.T) {
27182728
defer leaktest.AfterTest(t)()
27192729

27202730
opts := &Options{
2721-
FS: vfs.NewMem(),
2731+
FS: vfs.NewMem(),
2732+
Logger: testutils.Logger{T: t},
27222733
}
27232734
opts.WithFSDefaults()
27242735
db, err := Open("", testingRandomized(t, opts))
@@ -2755,6 +2766,7 @@ func TestMarkedForCompaction(t *testing.T) {
27552766
fmt.Fprintln(&buf, info)
27562767
},
27572768
},
2769+
Logger: testutils.Logger{T: t},
27582770
}
27592771
opts.WithFSDefaults()
27602772

@@ -2980,7 +2992,7 @@ func TestSharedObjectDeletePacing(t *testing.T) {
29802992
})
29812993
opts.Experimental.CreateOnShared = remote.CreateOnSharedAll
29822994
opts.TargetByteDeletionRate = 1
2983-
opts.Logger = testLogger{t}
2995+
opts.Logger = testutils.Logger{T: t}
29842996

29852997
d, err := Open("", &opts)
29862998
require.NoError(t, err)
@@ -3092,6 +3104,7 @@ func TestCompactionErrorStats(t *testing.T) {
30923104
}
30933105
},
30943106
},
3107+
Logger: testutils.Logger{T: t},
30953108
}
30963109
opts.WithFSDefaults()
30973110
for i := range opts.TargetFileSizes {
@@ -3185,6 +3198,7 @@ func TestCompactionCorruption(t *testing.T) {
31853198
},
31863199
L0CompactionThreshold: 1,
31873200
L0CompactionFileThreshold: 5,
3201+
Logger: testutils.Logger{T: t},
31883202
}
31893203
opts.WithFSDefaults()
31903204
remoteStorage := remote.NewInMem()

0 commit comments

Comments
 (0)