stores: fix NDFs

stores/metadata_test.go

@@ -23,8 +23,6 @@ import (
 	"lukechampine.com/frand"
 )
 
-var errDatabaseLocked = errors.New("database is locked")
-
 func randomMultisigUC() types.UnlockConditions {
 	uc := types.UnlockConditions{
 		PublicKeys:         make([]types.UnlockKey, 2),
@@ -2036,16 +2034,11 @@ func TestContractSectors(t *testing.T) {
 	}
 
 	// Delete the sector.
-	if err := ss.db.Delete(&dbSector{Model: Model{ID: 1}}).Error; err != nil {
-		if strings.Contains(err.Error(), errDatabaseLocked.Error()) {
-			time.Sleep(time.Second) // wait for slabs to be pruned in the background
-			err = ss.db.Delete(&dbSector{Model: Model{ID: 1}}).Error
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
+	if err := ss.retryTransaction(context.Background(), func(tx *gorm.DB) error {
+		return ss.db.Delete(&dbSector{Model: Model{ID: 1}}).Error
+	}); err != nil {
 		t.Fatal(err)
-	}
+	} // retry b/c database might be locked by slab deletion in RemoveObject
 	if err := ss.db.Find(&css).Error; err != nil {
 		t.Fatal(err)
 	}
@@ -4135,15 +4128,11 @@ func TestSlabCleanup(t *testing.T) {
 		Key:              ek,
 		HealthValidUntil: 100,
 	}
-	if err := ss.db.Create(&bufferedSlab).Error; err != nil {
-		if strings.Contains(err.Error(), errDatabaseLocked.Error()) {
-			time.Sleep(time.Second) // wait for slabs to be pruned in the background
-			err = ss.db.Create(&bufferedSlab).Error
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
+	if err := ss.retryTransaction(context.Background(), func(tx *gorm.DB) error {
+		return ss.db.Create(&bufferedSlab).Error
+	}); err != nil {
+		t.Fatal(err)
+	} // retry b/c database might be locked by slab deletion in RemoveObject
 	obj3 := dbObject{
 		ObjectID:   "3",
 		DBBucketID: ss.DefaultBucketID(),