Merge pull request #5585 from JAORMX/display-rem

ocp4/e2e: display remediations for second scan
ComplianceAsCode · Apr 14, 2020 · a433fbd · a433fbd
2 parents 09161b9 + a544cc0
commit a433fbd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/tests/ocp4e2e/e2e_test.go b/tests/ocp4e2e/e2e_test.go
@@ -35,7 +35,7 @@ func TestE2e(t *testing.T) {
 		// Create suite and auto-apply remediations
 		suite := ctx.createComplianceSuiteForProfile("1", true)
 		ctx.waitForComplianceSuite(suite)
-		numberOfRemediationsInit = ctx.getRemediationsForSuite(suite)
+		numberOfRemediationsInit = ctx.getRemediationsForSuite(suite, false)
 	})
 
 	t.Run("Wait for Remediations to apply", func(t *testing.T) {
@@ -48,7 +48,7 @@ func TestE2e(t *testing.T) {
 		// Create suite and auto-apply remediations
 		suite := ctx.createComplianceSuiteForProfile("2", false)
 		ctx.waitForComplianceSuite(suite)
-		numberOfRemediationsEnd = ctx.getRemediationsForSuite(suite)
+		numberOfRemediationsEnd = ctx.getRemediationsForSuite(suite, true)
 	})
 
 	t.Run("We should have less remediations to apply", func(t *testing.T) {

diff --git a/tests/ocp4e2e/helpers.go b/tests/ocp4e2e/helpers.go
@@ -355,7 +355,7 @@ func (ctx *e2econtext) waitForNodesToBeReady() {
 	}
 }
 
-func (ctx *e2econtext) getRemediationsForSuite(s *cmpv1alpha1.ComplianceSuite) int {
+func (ctx *e2econtext) getRemediationsForSuite(s *cmpv1alpha1.ComplianceSuite, display bool) int {
 	remList := &cmpv1alpha1.ComplianceRemediationList{}
 	labelSelector, _ := labels.Parse(cmpv1alpha1.SuiteLabel + "=" + s.Name)
 	opts := &client.ListOptions{
@@ -365,6 +365,14 @@ func (ctx *e2econtext) getRemediationsForSuite(s *cmpv1alpha1.ComplianceSuite) i
 	if err != nil {
 		ctx.t.Fatalf("Couldn't get remediation list")
 	}
+	if display {
+		if len(remList.Items) > 0 {
+			ctx.t.Logf("Remediations from ComplianceSuite: %s", s.Name)
+		}
+		for _, rem := range remList.Items {
+			ctx.t.Logf("- %s", rem.Name)
+		}
+	}
 	return len(remList.Items)
 }