update according to comments

master
Sida Chen 5 years ago
parent 32b11e54eb
commit 5a94499fdb

@ -134,46 +134,31 @@ func TestConcurrency(t *testing.T) {
func TestCaching(t *testing.T) { func TestCaching(t *testing.T) {
store, err := openDatabaseForTest("Caching", false) store, err := openDatabaseForTest("Caching", false)
if !assert.Nil(t, err) { require.Nil(t, err)
t.FailNow()
}
defer store.Close() defer store.Close()
nsFeatures, vulnerabilities := testGenRandomVulnerabilityAndNamespacedFeature(t, store) nsFeatures, vulnerabilities := testGenRandomVulnerabilityAndNamespacedFeature(t, store)
tx, err := store.Begin() tx, err := store.Begin()
if !assert.Nil(t, err) { require.Nil(t, err)
t.FailNow()
}
require.Nil(t, tx.PersistNamespacedFeatures(nsFeatures)) require.Nil(t, tx.PersistNamespacedFeatures(nsFeatures))
if err := tx.Commit(); err != nil { require.Nil(t, tx.Commit())
panic(err)
}
tx, err = store.Begin() tx, err = store.Begin()
if !assert.Nil(t, err) { require.Nil(t, tx.Commit())
t.FailNow()
}
require.Nil(t, tx.InsertVulnerabilities(vulnerabilities)) require.Nil(t, tx.InsertVulnerabilities(vulnerabilities))
if err := tx.Commit(); err != nil { require.Nil(t, tx.Commit())
panic(err)
}
tx, err = store.Begin() tx, err = store.Begin()
if !assert.Nil(t, err) { require.Nil(t, err)
t.FailNow()
}
defer tx.Rollback() defer tx.Rollback()
affected, err := tx.FindAffectedNamespacedFeatures(nsFeatures) affected, err := tx.FindAffectedNamespacedFeatures(nsFeatures)
if !assert.Nil(t, err) { require.Nil(t, err)
t.FailNow()
}
for _, ansf := range affected { for _, ansf := range affected {
if !assert.True(t, ansf.Valid) { require.True(t, ansf.Valid)
t.FailNow()
}
expectedAffectedNames := []string{} expectedAffectedNames := []string{}
for _, vuln := range vulnerabilities { for _, vuln := range vulnerabilities {

@ -270,7 +270,6 @@ func (tx *pgSession) FindAffectedNamespacedFeatures(features []database.Namespac
if err != nil { if err != nil {
return nil, handleError("searchNamespacedFeaturesVulnerabilities", err) return nil, handleError("searchNamespacedFeaturesVulnerabilities", err)
} }
defer rows.Close() defer rows.Close()
for rows.Next() { for rows.Next() {

Loading…
Cancel
Save