Skip to content

ocp4/e2e: Link test failure with sub-tests #6569

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
jhrozek merged 1 commit into from
Jan 27, 2021
Merged

ocp4/e2e: Link test failure with sub-tests #6569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 24 additions & 24 deletions tests/ocp4e2e/e2e_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,28 +8,28 @@ import (
func TestE2e(t *testing.T) {
ctx := newE2EContext(t)
t.Run("Parameter setup and validation", func(t *testing.T) {
ctx.assertRootdir()
ctx.assertProfile()
ctx.assertContentImage()
ctx.assertKubeClient()
ctx.assertRootdir(t)
ctx.assertProfile(t)
ctx.assertContentImage(t)
ctx.assertKubeClient(t)
})

t.Run("Operator setup", func(t *testing.T) {
ctx.ensureNamespaceExistsAndSet()
ctx.ensureNamespaceExistsAndSet(t)
if ctx.installOperator {
ctx.ensureCatalogSourceExists()
ctx.ensureOperatorGroupExists()
ctx.ensureSubscriptionExists()
ctx.waitForOperatorToBeReady()
ctx.ensureCatalogSourceExists(t)
ctx.ensureOperatorGroupExists(t)
ctx.ensureSubscriptionExists(t)
ctx.waitForOperatorToBeReady(t)
} else {
t.Logf("Skipping operator install as requested")
}
ctx.resetClientMappings()
})

t.Run("Prereqs setup", func(t *testing.T) {
ctx.ensureTestProfileBundle()
ctx.ensureTestSettings()
ctx.ensureTestProfileBundle(t)
ctx.ensureTestSettings(t)
})

// Remediations
Expand All @@ -53,32 +53,32 @@ func TestE2e(t *testing.T) {

t.Run("Run first compliance scan", func(t *testing.T) {
// Create suite and auto-apply remediations
suite = ctx.createBindingForProfile()
ctx.waitForComplianceSuite(suite)
numberOfRemediations = ctx.getRemediationsForSuite(suite)
numberOfFailuresInit = ctx.getFailuresForSuite(suite)
numberOfCheckResultsInit, manualRemediations = ctx.verifyCheckResultsForSuite(suite, false)
numberOfInvalidResults = ctx.getInvalidResultsFromSuite(suite)
suite = ctx.createBindingForProfile(t)
ctx.waitForComplianceSuite(t, suite)
numberOfRemediations = ctx.getRemediationsForSuite(t, suite)
numberOfFailuresInit = ctx.getFailuresForSuite(t, suite)
numberOfCheckResultsInit, manualRemediations = ctx.verifyCheckResultsForSuite(t, suite, false)
numberOfInvalidResults = ctx.getInvalidResultsFromSuite(t, suite)
})

if numberOfRemediations > 0 || len(manualRemediations) > 0 {
if len(manualRemediations) > 0 {
t.Run("Apply manual remediations", func(t *testing.T) {
ctx.applyManualRemediations(manualRemediations)
ctx.applyManualRemediations(t, manualRemediations)
})
}
t.Run("Wait for Remediations to apply", func(t *testing.T) {
// Lets wait for the MachineConfigs to start applying
time.Sleep(30 * time.Second)
ctx.waitForMachinePoolUpdate("master")
ctx.waitForMachinePoolUpdate("worker")
ctx.waitForMachinePoolUpdate(t, "master")
ctx.waitForMachinePoolUpdate(t, "worker")
})

t.Run("Run second compliance scan", func(t *testing.T) {
ctx.doRescan(suite)
ctx.waitForComplianceSuite(suite)
numberOfFailuresEnd = ctx.getFailuresForSuite(suite)
numberOfCheckResultsEnd, _ = ctx.verifyCheckResultsForSuite(suite, true)
ctx.doRescan(t, suite)
ctx.waitForComplianceSuite(t, suite)
numberOfFailuresEnd = ctx.getFailuresForSuite(t, suite)
numberOfCheckResultsEnd, _ = ctx.verifyCheckResultsForSuite(t, suite, true)
})

t.Run("We should have the same number of check results in each scan", func(t *testing.T) {
Expand Down
Loading