Skip to content

e2e: fix tests with latest vuln data #1999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 30, 2025
Merged

e2e: fix tests with latest vuln data #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3dd15a
e2e: fix tests with latest vuln data
RTann Jul 24, 2025
a1145d6
move to unexpected
RTann Jul 25, 2025
3eae919
update DB timeout
RTann Jul 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion cmd/clair/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ func Boot(config *Config, slimMode bool) {
go func() {
defer wg.Add(-1)
var err error
db, err = database.OpenWithRetries(config.Database, true, 30, 10*time.Second)
// Wait for the DB to be ready: 10 minutes.
db, err = database.OpenWithRetries(config.Database, true, 60, 10*time.Second)
if err != nil {
log.WithError(err).Fatal("Failed to open database despite multiple retries...")
}
Expand Down
6 changes: 3 additions & 3 deletions e2etests/testcase_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4028,7 +4028,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
Name: "tomcat",
VersionFormat: component.JavaSourceType.String(),
Version: "9.0.59",
FixedBy: "9.0.104",
FixedBy: "9.0.106",
Location: "tomcat-embed-core-9.0.59.jar",
Vulnerabilities: []apiV1.Vulnerability{
{
Expand Down Expand Up @@ -4797,7 +4797,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
NamespaceName: "rhel:8",
VersionFormat: "rpm",
Version: "1:17.0.11.0.9-2.el8.x86_64",
FixedBy: "1:17.0.15.0.6-2.el8",
FixedBy: "1:17.0.16.0.8-2.el8",
AddedBy: "sha256:06c7a3d491f551a56296ccb9bee8a68c83776991e73a9005e8b5ebb533002097",
},
},
Expand All @@ -4816,7 +4816,7 @@ All OpenShift Container Platform 4.10 users are advised to upgrade to these upda
NamespaceName: "rhel:8",
VersionFormat: "rpm",
Version: "1:17.0.13.0.11-3.el8.x86_64",
FixedBy: "1:17.0.15.0.6-2.el8",
FixedBy: "1:17.0.16.0.8-2.el8",
AddedBy: "sha256:2f7b9495af5ddc85b0be7ca9411fddb54f37999ea73b03cbf1115dd0c5bd4f95",
},
},
Expand Down
35 changes: 22 additions & 13 deletions e2etests/vuln_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,16 +142,23 @@ func TestStackroxVulnImages(t *testing.T) {
image: "quay.io/rhacs-eng/qa:rails-cve-2016-2098",
expectedFeatures: []feature{
{"rails", "4.2.5.1", []expectedVuln{
{name: "CVE-2016-2098"},
{name: "CVE-2016-6316"},
{name: "CVE-2016-6317"},
{name: "CVE-2018-16476", fixedBy: "4.2.11"},
{name: "CVE-2019-5418", fixedBy: "4.2.11.1"},
{name: "CVE-2019-5419", fixedBy: "4.2.11.1"},
{name: "CVE-2019-5420", fixedBy: "5.2.2.1"},
},
},
},
unexpectedVulns: []feature{
{"rails", "4.2.5.1", []expectedVuln{
// These three vulns should exist, but NVD set these to deferred.
// Placing them here until they are no longer deferred.
{name: "CVE-2016-2098"},
{name: "CVE-2016-6316"},
{name: "CVE-2016-6317"},
},
},
},
},
{
// docker.io/1and1internet/ubuntu-16-customerssh:latest
Expand All @@ -177,10 +184,6 @@ func TestStackroxVulnImages(t *testing.T) {
{name: "CVE-2019-10086", fixedBy: ""},
},
},
{"commons_fileupload", "1.3.2", []expectedVuln{
{name: "CVE-2016-1000031", fixedBy: ""},
},
},
{"guava", "18.0", []expectedVuln{
{name: "CVE-2018-10237", fixedBy: "24.1.1"},
},
Expand All @@ -194,6 +197,12 @@ func TestStackroxVulnImages(t *testing.T) {
{name: "CVE-2015-2512"},
},
},
{"commons_fileupload", "1.3.2", []expectedVuln{
// This vuln should exist, but NVD set it to deferred.
// Placing it here until they are no longer deferred.
{name: "CVE-2016-1000031", fixedBy: ""},
},
},
},
},
{
Expand All @@ -209,17 +218,17 @@ func TestStackroxVulnImages(t *testing.T) {
{
// docker.io/library/cassandra:latest
image: "quay.io/rhacs-eng/qa:cassandra",
expectedFeatures: []feature{
{"logback", "1.1.3", []expectedVuln{
{name: "CVE-2017-5929", fixedBy: ""},
},
},
},
unexpectedVulns: []feature{
{"slingshot", "0.10.3", []expectedVuln{
{name: "CVE-2015-5711"},
},
},
{"logback", "1.1.3", []expectedVuln{
// This vuln should exist, but NVD set it to deferred.
// Placing it here until they are no longer deferred.
{name: "CVE-2017-5929", fixedBy: ""},
},
},
},
},
{
Expand Down