Fix flaky unit tests (#2904)

* Fix flaky TestResolver unit test

Signed-off-by: Christoph Blecker <[email protected]>

* Fix flaky TestUpdates unit test

Signed-off-by: Christoph Blecker <[email protected]>

Signed-off-by: Christoph Blecker <[email protected]>
Upstream-repository: operator-lifecycle-manager
Upstream-commit: 4da774fdf1c1d64c2fbc8dafd8b55878312ed962

Author: cblecker

pkg/manifests/csv.yaml

@@ -5,7 +5,7 @@ metadata:
   name: packageserver
   namespace: openshift-operator-lifecycle-manager
   labels:
-    olm.version: 0.0.0-e530b95651301b319933fe04f16fed82b98aab1c
+    olm.version: 0.0.0-d7f3cde7050e452011a0aa095c81a6fc92bff114
     olm.clusteroperator.name: operator-lifecycle-manager-packageserver
   annotations:
     include.release.openshift.io/self-managed-high-availability: "true"
@@ -159,7 +159,7 @@ spec:
                                 - packageserver
                         topologyKey: "kubernetes.io/hostname"
   maturity: alpha
-  version: 0.0.0-e530b95651301b319933fe04f16fed82b98aab1c
+  version: 0.0.0-d7f3cde7050e452011a0aa095c81a6fc92bff114
   apiservicedefinitions:
     owned:
       - group: packages.operators.coreos.com

staging/operator-lifecycle-manager/pkg/controller/operators/olm/operator_test.go

@@ -3923,9 +3923,10 @@ func TestUpdates(t *testing.T) {
 					simulateSuccessfulRollout(current, op.opClient)
 				}
 				for current.Status.Phase != e.whenIn.phase {
-					fmt.Printf("waiting for (when) %s to be %s\n", e.whenIn.name, e.whenIn.phase)
 					csvsToSync = syncCSVs(csvsToSync, deletedCSVs(e.shouldBe))
 					current = csvsToSync[e.whenIn.name]
+					fmt.Printf("waiting for (when) %s to be %s\n", e.whenIn.name, e.whenIn.phase)
+					time.Sleep(1 * time.Millisecond)
 				}
 
 				// sync the other csvs until they're in the expected status

staging/operator-lifecycle-manager/pkg/controller/registry/resolver/step_resolver_test.go

@@ -1182,7 +1182,7 @@ func TestResolver(t *testing.T) {
 				steps: [][]*v1alpha1.Step{},
 				subs:  []*v1alpha1.Subscription{},
 				errAssert: func(t *testing.T, err error) {
-					assert.Contains(t, err.Error(), "failed to populate resolver cache from source @existing/catsrc-namespace: csv catsrc-namespace/a.v1")
+					assert.Contains(t, err.Error(), "failed to populate resolver cache from source @existing/catsrc-namespace: csv")
 					assert.Contains(t, err.Error(), "in phase Failed instead of Replacing")
 				},
 			},