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

Fix regression in ps with custom format #2232

Merged
merged 1 commit into from
Feb 1, 2019

Conversation

baude
Copy link
Member

@baude baude commented Jan 29, 2019

Using the table keyword in go templating had regressed and was
no longer working.

Fixes: 2221

Signed-off-by: baude [email protected]

@openshift-ci-robot openshift-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M labels Jan 29, 2019
test/e2e/ps_test.go Outdated Show resolved Hide resolved
@mheon
Copy link
Member

mheon commented Jan 29, 2019

Firstly... ew. This code is useful, certainly (for formatting output for scripts and such), but if I could I'd exorcise this particular demon and pretend it never existed.

Secondly, LGTM.
/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: baude, mheon

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

@baude
Copy link
Member Author

baude commented Jan 29, 2019

Firstly... ew. This code is useful, certainly (for formatting output for scripts and such), but if I could I'd exorcise this particular demon and pretend it never existed.

Go formatting is ... ew.

@TomSweeneyRedHat
Copy link
Member

@baude you make Go Formatting sound better than it is imo. Ugh.

@TomSweeneyRedHat
Copy link
Member

LGTM, assuming happy tests.

Copy link
Member

@jwhonce jwhonce left a comment

Choose a reason for hiding this comment

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

LGTM

cmd/podman/ps.go Outdated Show resolved Hide resolved
return err
}

fmt.Fprintln(w, "")
Copy link
Member

Choose a reason for hiding this comment

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

fmt.Fprintf(w, "\n") Seems clearer as to intention.

@debarshiray
Copy link
Member

Oh, wow! Thanks @baude We happened to have just noticed this same regression when hacking something up for the Fedora Toolbox.

@debarshiray
Copy link
Member

Oh, I now see that @ozoder had filed #2221 for this. He's the one who noticed it for the Toolbox. Still, much appreciated.

Expect(result.ExitCode()).To(Equal(0))
Expect(result.IsJSONOutputValid()).To(BeTrue())
Expect(result.IsJSONOutputValid()).To(BeFalse())
Copy link
Member

Choose a reason for hiding this comment

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

We want invalid json output?

Copy link
Member Author

Choose a reason for hiding this comment

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

Im not sure what the history is there but the output should NOT be json. maybe it should just be removed.

Using the table keyword in go templating had regressed and was
no longer working.

Fixes: 2221

Signed-off-by: baude <[email protected]>
@rhatdan
Copy link
Member

rhatdan commented Feb 1, 2019

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 1, 2019
@openshift-merge-robot openshift-merge-robot merged commit e133834 into containers:master Feb 1, 2019
@baude baude deleted the pstable branch December 22, 2019 19:04
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 25, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 25, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants