@@ -1463,20 +1463,8 @@ func TestCompactionPickerScores(t *testing.T) {
1463
1463
fs := vfs .NewMem ()
1464
1464
cleaner := pausableCleaner {cleaner : DeleteCleaner {}}
1465
1465
cleaner .cond .L = & cleaner .mu
1466
- opts := & Options {
1467
- Cleaner : & cleaner ,
1468
- Comparer : testkeys .Comparer ,
1469
- DisableAutomaticCompactions : true ,
1470
- FormatMajorVersion : FormatNewest ,
1471
- FS : fs ,
1472
- Logger : testutils.Logger {T : t },
1473
- }
1474
- opts .Experimental .CompactionScheduler = func () CompactionScheduler {
1475
- return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest ()
1476
- }
1477
1466
1478
- d , err := Open ("" , opts )
1479
- require .NoError (t , err )
1467
+ var d * DB
1480
1468
defer func () {
1481
1469
if d != nil {
1482
1470
cleaner .resume ()
@@ -1500,15 +1488,26 @@ func TestCompactionPickerScores(t *testing.T) {
1500
1488
return ""
1501
1489
1502
1490
case "define" :
1503
- require .NoError (t , closeAllSnapshots (d ))
1504
- require .NoError (t , d .Close ())
1491
+ if d != nil {
1492
+ require .NoError (t , closeAllSnapshots (d ))
1493
+ require .NoError (t , d .Close ())
1494
+ }
1505
1495
1506
1496
if td .HasArg ("pause-cleaning" ) {
1507
1497
cleaner .pause ()
1508
1498
}
1499
+ opts := & Options {
1500
+ Cleaner : & cleaner ,
1501
+ Comparer : testkeys .Comparer ,
1502
+ DisableAutomaticCompactions : true ,
1503
+ FormatMajorVersion : FormatNewest ,
1504
+ FS : fs ,
1505
+ Logger : testutils.Logger {T : t },
1506
+ }
1509
1507
opts .Experimental .CompactionScheduler = func () CompactionScheduler {
1510
1508
return NewConcurrencyLimitSchedulerWithNoPeriodicGrantingForTest ()
1511
1509
}
1510
+ var err error
1512
1511
d , err = runDBDefineCmd (td , opts )
1513
1512
if err != nil {
1514
1513
return err .Error ()
@@ -1542,10 +1541,10 @@ func TestCompactionPickerScores(t *testing.T) {
1542
1541
return ""
1543
1542
1544
1543
case "ingest" :
1545
- if err = runBuildCmd (td , d , d .opts .FS ); err != nil {
1544
+ if err : = runBuildCmd (td , d , d .opts .FS ); err != nil {
1546
1545
return err .Error ()
1547
1546
}
1548
- if err = runIngestCmd (td , d , d .opts .FS ); err != nil {
1547
+ if err : = runIngestCmd (td , d , d .opts .FS ); err != nil {
1549
1548
return err .Error ()
1550
1549
}
1551
1550
d .mu .Lock ()
0 commit comments