Fix flaky unit tests (#2904)

* Fix flaky TestResolver unit test Signed-off-by: Christoph Blecker <cblecker@redhat.com> * Fix flaky TestUpdates unit test Signed-off-by: Christoph Blecker <cblecker@redhat.com> Signed-off-by: Christoph Blecker <cblecker@redhat.com>
operator-framework · Dec 6, 2022 · 4da774f · 4da774f
1 parent afbb609
commit 4da774f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/pkg/controller/operators/olm/operator_test.go b/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

diff --git a/pkg/controller/registry/resolver/step_resolver_test.go b/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")
  },
  },