Count CO correctly

Author: hongkailiu

pkg/monitortests/cli/adm_upgrade/status/controlplane.go

@@ -100,9 +100,7 @@ func (w *monitor) controlPlane() *junitapi.JUnitTestCase {
 			}
 
 			items := len(strings.Split(updatingOperators, ","))
-			// TODO: These should actually exactly match, but `oc adm upgrade status` emits operators with linebreaks in
-			// messages in a crappy way which we will need to fix
-			if len(cp.Operators) < items {
+			if len(cp.Operators) != items {
 				fail(fmt.Sprintf("Control plane summary contains Updating key with %d operators but operators section has %d items", items, len(cp.Operators)))
 				continue
 			}

pkg/monitortests/cli/adm_upgrade/status/outputmodel.go

@@ -260,12 +260,17 @@ func (p *parser) parseControlPlaneOperators() ([]string, error) {
 	var operators []string
 
 	for {
-		line, done := p.next()
+		line, done := p.next(preserveLeadingWhitespace)
 		if done || line == "" {
 			break
 		}
-
-		operators = append(operators, line)
+		trimLeft := strings.TrimLeft(line, " \t")
+		if len(operators) == 0 || line == trimLeft {
+			operators = append(operators, line)
+		} else {
+			last := len(operators) - 1
+			operators[last] = fmt.Sprintf("%s\n%s", operators[last], trimLeft)
+		}
 	}
 
 	if len(operators) == 0 {