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

Bug 1828958: Fix handling of Operand conditions #5232

Merged
merged 1 commit into from Apr 29, 2020

Conversation

spadgett
Copy link
Member

Check condition.status before using a condition as the operand status. Also make sure phase, status, or state are strings before displaying them.

/assign @benjaminapetersen

@spadgett spadgett added this to the v4.5 milestone Apr 29, 2020
@openshift-ci-robot openshift-ci-robot added the bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. label Apr 29, 2020
@openshift-ci-robot
Copy link
Contributor

@spadgett: This pull request references Bugzilla bug 1828958, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target release (4.5.0) matches configured target release for branch (4.5.0)
  • bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, ON_DEV, POST, POST)

In response to this:

Bug 1828958: Fix handling of Operand conditions

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/olm Related to OLM labels Apr 29, 2020
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 29, 2020
@spadgett
Copy link
Member Author

/cherry-pick release-4.4

@openshift-cherrypick-robot

@spadgett: once the present PR merges, I will cherry-pick it on top of release-4.4 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@spadgett
Copy link
Member Author

/unassign @benjaminapetersen
/assign @rhamilto

Copy link
Member

@rhamilto rhamilto left a comment

Choose a reason for hiding this comment

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

So much win! A few typos, but otherwise lgtm.


it('dispalys the correct status and status type for a status value of running', () => {
it('dispalys the correct status a `status` value of `Running`', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('dispalys the correct status a `status` value of `Running`', () => {
it('displays the correct status for a `status` value of `Running`', () => {

expect(wrapper.childAt(2).props().title).toEqual('Running');
});

it('displays the correct status and status type for a phase value of running', () => {
it('displays the correct status a `phase` value of `Running`', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('displays the correct status a `phase` value of `Running`', () => {
it('displays the correct status for a `phase` value of `Running`', () => {

expect(wrapper.childAt(2).props().title).toEqual('Running');
});

it('displays Unknown for a missing or unknown status object', () => {
it('displays the correct status a `phase` value of `Running`', () => {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
it('displays the correct status a `phase` value of `Running`', () => {
it('displays the correct status for a `phase` value of `Running`', () => {

Check `condition.status` before showing a condition as the operand status.
@spadgett
Copy link
Member Author

thanks @rhamilto 👍

updated

@rhamilto
Copy link
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 29, 2020
@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhamilto, spadgett

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

@openshift-merge-robot openshift-merge-robot merged commit 4939f0f into openshift:master Apr 29, 2020
@openshift-ci-robot
Copy link
Contributor

@spadgett: All pull requests linked via external trackers have merged: openshift/console#5232. Bugzilla bug 1828958 has been moved to the MODIFIED state.

In response to this:

Bug 1828958: Fix handling of Operand conditions

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@openshift-cherrypick-robot

@spadgett: #5232 failed to apply on top of branch "release-4.4":

error: Failed to merge in the changes.
Using index info to reconstruct a base tree...
A	frontend/packages/operator-lifecycle-manager/src/components/operand/index.spec.tsx
A	frontend/packages/operator-lifecycle-manager/src/components/operand/index.tsx
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operand.tsx
Auto-merging frontend/packages/operator-lifecycle-manager/src/components/operand.spec.tsx
CONFLICT (content): Merge conflict in frontend/packages/operator-lifecycle-manager/src/components/operand.spec.tsx
Patch failed at 0001 Bug 1828958: Fix handling of Operand conditions

In response to this:

/cherry-pick release-4.4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

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. bugzilla/severity-medium Referenced Bugzilla bug's severity is medium for the branch this PR is targeting. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. component/olm Related to OLM lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants