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

apiv2 test fixes #9289

Merged

Conversation

edsantiago
Copy link
Member

It's been a while since I last looked at these; some cruft
has crept in, generating noise and hence unreadable test
results. Clean it up:

  • remove pushd/popd in one subtest, replace with 'tar -C'.
    (Also remove confusing quotation marks). This removes
    spurious directory names from output.

  • in like(), show only first line of actual output.
    Some commands ('tree', 'generate kube') produce
    voluminous multi-line output, which is super useless
    and distracting when reading a test run.

  • Recognize that some queries will not generate output,
    e.g. HEAD requests and some POSTs. Deal with that.
    This fixes "curl.result.out: no such file" and "parse
    error" warnings.

  • In cleanup, 'podman rm -a' and 'rmi -af'; this gets
    rid of errors when deleting $WORKDIR. (EBUSY error
    when root, EPERM when rootless).

And, the original reason for poking in here: refactor the
wait-for-port part of start_server() into its own helper
function, so we can use it when starting a local registry
in 12-imagesMore. (Ref: #9270)

Signed-off-by: Ed Santiago [email protected]

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: edsantiago

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-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 9, 2021
@edsantiago
Copy link
Member Author

/hold

DO NOT MERGE (yet) - this PR is based on #9270. (I don't actually depend on it, in fact it's probably the converse, but I'd like that one to go in first because it's been in the pipeline for longer).

If for any reason #9270 fails CI or review I'll need to resubmit this, and will then decide whether to rebase on master (and have 9270 rebase here) or whether to rebase on a changed 9270. I am gambling on 9270 passing CI and review.

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2021
matejvasek and others added 2 commits February 9, 2021 18:20
Docker doesn't have the destination parameter as libpod does,
the "image name" path parameter is supposed to be the destination.

Signed-off-by: Matej Vasek <[email protected]>
It's been a while since I last looked at these; some cruft
has crept in, generating noise and hence unreadable test
results. Clean it up:

 * remove pushd/popd in one subtest, replace with 'tar -C'.
   (Also remove confusing quotation marks). This removes
   spurious directory names from output.

 * in like(), show only first line of actual output.
   Some commands ('tree', 'generate kube') produce
   voluminous multi-line output, which is super useless
   and distracting when reading a test run.

 * Recognize that some queries will not generate output,
   e.g. HEAD requests and some POSTs. Deal with that.
   This fixes "curl.result.out: no such file" and "parse
   error" warnings.

 * In cleanup, 'podman rm -a' and 'rmi -af'; this gets
   rid of errors when deleting $WORKDIR. (EBUSY error
   when root, EPERM when rootless).

And, the original reason for poking in here: refactor the
wait-for-port part of start_server() into its own helper
function, so we can use it when starting a local registry
in 12-imagesMore. (Ref: containers#9270)

Signed-off-by: Ed Santiago <[email protected]>
@edsantiago
Copy link
Member Author

Confirmed: much nicer cleaner test log

@TomSweeneyRedHat
Copy link
Member

LGTM
assuming happy tests

@edsantiago
Copy link
Member Author

/hold cancel

#9270 is merged, so this should merge cleanly. Tests are green. @containers/podman-maintainers PTAL

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 9, 2021
@rhatdan
Copy link
Member

rhatdan commented Feb 9, 2021

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 9, 2021
@openshift-merge-robot openshift-merge-robot merged commit cd8a061 into containers:master Feb 9, 2021
@edsantiago edsantiago deleted the apiv2_test_fixes branch February 9, 2021 19:41
@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 23, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 23, 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.

6 participants