Skip to content

Commit 1915491

Browse files
dhaiducekopenshift-merge-bot[bot]
authored andcommitted
Bump Quay operator to v3.10.7
Signed-off-by: Dale Haiducek <[email protected]>
1 parent 266cc9d commit 1915491

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

test/e2e/case38_install_operator_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3647,7 +3647,7 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
36473647
const (
36483648
opPolYAML = "../resources/case38_operator_install/operator-policy-no-group-enforce.yaml"
36493649
opPolName = "oppol-no-group-enforce"
3650-
latestQuay310 = "quay-operator.v3.10.6"
3650+
latestQuay310 = "quay-operator.v3.10.7"
36513651
)
36523652

36533653
BeforeEach(func() {
@@ -3658,18 +3658,18 @@ var _ = Describe("Testing OperatorPolicy", Ordered, Label("supports-hosted"), fu
36583658
})
36593659

36603660
It("Should start compliant", func(ctx SpecContext) {
3661-
Eventually(func(ctx SpecContext) string {
3662-
csv, _ := targetK8sDynamic.Resource(gvrClusterServiceVersion).Namespace(opPolTestNS).
3661+
Eventually(func(ctx SpecContext) (map[string]interface{}, error) {
3662+
csv, err := targetK8sDynamic.Resource(gvrClusterServiceVersion).Namespace(opPolTestNS).
36633663
Get(ctx, latestQuay310, metav1.GetOptions{})
36643664

3665-
if csv == nil {
3666-
return ""
3665+
if csv == nil || err != nil {
3666+
return map[string]interface{}{}, err
36673667
}
36683668

3669-
reason, _, _ := unstructured.NestedString(csv.Object, "status", "reason")
3669+
status, _, _ := unstructured.NestedMap(csv.Object, "status")
36703670

3671-
return reason
3672-
}, olmWaitTimeout, 5, ctx).Should(Equal("InstallSucceeded"))
3671+
return status, nil
3672+
}, olmWaitTimeout, 5, ctx).Should(HaveKeyWithValue("reason", "InstallSucceeded"))
36733673

36743674
check(
36753675
opPolName,

0 commit comments

Comments
 (0)