From 7b2192f171d52c963dcbff9f5702754d3ecd54b9 Mon Sep 17 00:00:00 2001
From: Chris Suszynski <ksuszyns@redhat.com>
Date: Thu, 21 May 2020 23:23:58 +0200
Subject: [PATCH] Upgrade test status set to skip if errors found (#3180)

---
 test/upgrade/probe_test.go    |  2 +-
 test/upgrade/prober/prober.go | 30 +++++++++++++++++++-----------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/test/upgrade/probe_test.go b/test/upgrade/probe_test.go
index a8949855d52..cb0c4e3e1ca 100644
--- a/test/upgrade/probe_test.go
+++ b/test/upgrade/probe_test.go
@@ -34,7 +34,7 @@ const (
 	readyMessage = "prober ready"
 )
 
-func TestProbe(t *testing.T) {
+func TestContinuousEventsPropagationWithProber(t *testing.T) {
 	// We run the prober as a golang test because it fits in nicely with
 	// the rest of our integration tests, and AssertProberDefault needs
 	// a *testing.T. Unfortunately, "go test" intercepts signals, so we
diff --git a/test/upgrade/prober/prober.go b/test/upgrade/prober/prober.go
index 3f7c1c536fa..f62445f9626 100644
--- a/test/upgrade/prober/prober.go
+++ b/test/upgrade/prober/prober.go
@@ -39,8 +39,8 @@ type Prober interface {
 	// Finish send finished event
 	Finish()
 
-	// ReportError will reports found errors in proper way
-	ReportError(t *testing.T, err error)
+	// ReportErrors will reports found errors in proper way
+	ReportErrors(t *testing.T, errors []error)
 
 	// deploy a prober to a cluster
 	deploy()
@@ -92,12 +92,12 @@ func AssertEventProber(t *testing.T, prober Prober) {
 	if len(errors) == 0 {
 		t.Logf("All %d events propagated well", events)
 	} else {
-		t.Logf("There ware %v errors. Listing them below.", len(errors))
-	}
-	for _, err := range errors {
-		prober.ReportError(t, err)
+		t.Logf("There were %d events propagated, but %d errors occured. "+
+			"Listing them below.", events, len(errors))
 	}
 
+	prober.ReportErrors(t, errors)
+
 	prober.remove()
 }
 
@@ -114,11 +114,19 @@ func (p *prober) servingClient() resources.ServingClient {
 	}
 }
 
-func (p *prober) ReportError(t *testing.T, err error) {
-	if p.config.FailOnMissingEvents {
-		t.Error(err)
-	} else {
-		p.log.Warnf("Silenced FAIL: %v", err)
+func (p *prober) ReportErrors(t *testing.T, errors []error) {
+	for _, err := range errors {
+		if p.config.FailOnMissingEvents {
+			t.Error(err)
+		} else {
+			p.log.Warnf("Silenced FAIL: %v", err)
+		}
+	}
+	if len(errors) > 0 && !p.config.FailOnMissingEvents {
+		t.Skipf(
+			"Found %d errors, but FailOnMissingEvents is false. Skipping test.",
+			len(errors),
+		)
 	}
 }