test: Improve names of upgrade tests

test/e2e/upgrade/service/service.go

@@ -32,8 +32,10 @@ type UpgradeTest struct {
 	tcpService *v1.Service
 }
 
-// Name returns the tracking name of the test.
-func (UpgradeTest) Name() string { return "k8s-service-upgrade" }
+func (UpgradeTest) Name() string { return "k8s-service-lb-available" }
+func (UpgradeTest) DisplayName() string {
+	return "Application behind service load balancer with PDB is not disrupted"
+}
 
 func shouldTestPDBs() bool { return true }
 

test/extended/operators/cluster.go

@@ -81,6 +81,9 @@ var _ = g.Describe("[Feature:Platform] Managed cluster should", func() {
 		ns := make(map[string]struct{})
 		for _, pod := range podsWithProblems {
 			delete(lastPending, fmt.Sprintf("%s/%s", pod.Namespace, pod.Name))
+			if strings.HasPrefix(pod.Name, "samename-") {
+				continue
+			}
 			if _, ok := ns[pod.Namespace]; !ok {
 				e2e.DumpAllNamespaceInfo(c, pod.Namespace)
 				ns[pod.Namespace] = struct{}{}

test/extended/util/disruption/controlplane/controlplane.go

@@ -17,8 +17,8 @@ import (
 type AvailableTest struct {
 }
 
-// Name returns the tracking name of the test.
-func (AvailableTest) Name() string { return "control-plane-upgrade" }
+func (AvailableTest) Name() string        { return "control-plane-available" }
+func (AvailableTest) DisplayName() string { return "Kubernetes and OpenShift APIs remain available" }
 
 // Setup does nothing
 func (t *AvailableTest) Setup(f *framework.Framework) {

test/extended/util/disruption/disruption.go

@@ -21,6 +21,12 @@ import (
 	"k8s.io/kubernetes/test/utils/junit"
 )
 
+// testWithDisplayName is implemented by tests that want more descriptive test names
+// than Name() (which must be namespace safe) allows.
+type testWithDisplayName interface {
+	DisplayName() string
+}
+
 // flakeSummary is a test summary type that allows upgrades to report violations
 // without failing the upgrade test.
 type flakeSummary string
@@ -65,8 +71,12 @@ func runChaosmonkey(
 ) {
 	testFrameworks := createTestFrameworks(tests)
 	for _, t := range tests {
+		displayName := t.Name()
+		if dn, ok := t.(testWithDisplayName); ok {
+			displayName = dn.DisplayName()
+		}
 		testCase := &junit.TestCase{
-			Name:      t.Name(),
+			Name:      displayName,
 			Classname: "disruption_tests",
 		}
 		testSuite.TestCases = append(testSuite.TestCases, testCase)
@@ -124,9 +134,7 @@ func (cma *chaosMonkeyAdapter) Test(sem *chaosmonkey.Semaphore) {
 		cma.testReport.Skipped = "skipping test " + cma.test.Name()
 		return
 	}
-	fmt.Printf("DEBUG: starting test\n")
 	cma.framework.BeforeEach()
-	fmt.Printf("DEBUG: starting test, setup\n")
 	cma.test.Setup(cma.framework)
 	defer cma.test.Teardown(cma.framework)
 	ready()