Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test/e2e: wrap subscription e2e test logic in Eventually statement #2392

Conversation

exdx
Copy link
Member

@exdx exdx commented Oct 4, 2021

Signed-off-by: Daniel Sover dsover@redhat.com

Description of the change:
Fixes up the "with starting CSV" test by wrapping a flake-prone path with an Eventually()

Motivation for the change:
Flaky test

Reviewer Checklist

  • Implementation matches the proposed design, or proposal is updated to match implementation
  • Sufficient unit test coverage
  • Sufficient end-to-end test coverage
  • Docs updated or added to /doc
  • Commit messages sensible and descriptive

@@ -467,9 +467,14 @@ var _ = Describe("Subscription", func() {
require.NoError(GinkgoT(), err)

// Wait for the subscription to begin upgrading to csvB
subscription, err = fetchSubscription(crc, testNamespace, subscriptionName, subscriptionStateUpgradePendingChecker)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I wonder if this should be handled at the fetchSubscription layer, and instead, create a new checker type.

/lgtm

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we probably want to start getting rid of a lot of the custom test framework if we can write test specs simply at the call sites.

it seems like maintaining custom test frameworks is one place where the cost of being DRY outweighs its value

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
@exdx exdx force-pushed the fix/e2e-sub-with-starting-csv branch from 2732fd6 to ed1508e Compare October 4, 2021 19:45
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
Copy link
Member

@njhale njhale left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good, one thought:

test/e2e/subscription_e2e_test.go Outdated Show resolved Hide resolved
Signed-off-by: Daniel Sover <dsover@redhat.com>
@exdx exdx force-pushed the fix/e2e-sub-with-starting-csv branch from ed1508e to 3bde04e Compare October 4, 2021 21:08
@njhale
Copy link
Member

njhale commented Oct 4, 2021

/approve

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 4, 2021
@openshift-ci
Copy link

openshift-ci bot commented Oct 4, 2021

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: exdx, njhale

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@timflannagan
Copy link
Contributor

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 4, 2021
@openshift-merge-robot openshift-merge-robot merged commit 1a6a03e into operator-framework:master Oct 4, 2021
@timflannagan timflannagan mentioned this pull request Oct 6, 2021
43 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants