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

Correct compat images/create?fromImage response #9509

Merged
merged 1 commit into from
Mar 1, 2021
Merged

Correct compat images/create?fromImage response #9509

merged 1 commit into from
Mar 1, 2021

Conversation

mlegenovic
Copy link
Contributor

#7857

Signed-off-by: Milivoje Legenovic m.legenovic@gmail.com

@mheon
Copy link
Member

mheon commented Feb 25, 2021

Linter seems to be throwing errors. Nice work, though, glad to see someone take this one!

@mlegenovic
Copy link
Contributor Author

@mheon Do you (or anyone else) have idea how to fix these two tests:

t POST "images/create?fromImage=alpine" '' 200 .error=null .status~".*Download complete.*"
t POST "images/create?fromImage=alpine" '' 200 .error=null .status~".*$old_iid.*"

Is it possible to handle multi-json result in this test template, or do I need to move these tests to python?

@mheon
Copy link
Member

mheon commented Feb 25, 2021

I'll defer to @edsantiago for an answer, but I suspect that they'll need to be moved to Python.

@mheon
Copy link
Member

mheon commented Feb 25, 2021

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

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

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 25, 2021
@edsantiago
Copy link
Member

diff --git a/test/apiv2/10-images.at b/test/apiv2/10-images.at
index a650cf958..f866422e2 100644
--- a/test/apiv2/10-images.at
+++ b/test/apiv2/10-images.at
@@ -41,7 +41,7 @@ t GET images/$iid/json 200 \
   .Id=sha256:$iid \
   .RepoTags[0]=$IMAGE

-t POST "images/create?fromImage=alpine" '' 200 .error=null .status~".*Download complete.*"
+t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*Download complete.*"

 t POST "images/create?fromImage=alpine&tag=latest" '' 200

@@ -49,7 +49,7 @@ t POST "images/create?fromImage=alpine&tag=latest" '' 200
 old_iid=$(podman image inspect --format "{{.ID}}" docker.io/library/alpine:latest)
 podman rmi -f docker.io/library/alpine:latest
 podman tag $IMAGE docker.io/library/alpine:latest
-t POST "images/create?fromImage=alpine" '' 200 .error=null .status~".*$old_iid.*"
+t POST "images/create?fromImage=alpine" '' 200 .error~null .status~".*$old_iid.*"
 podman untag $IMAGE docker.io/library/alpine:latest

 t POST "images/create?fromImage=quay.io/libpod/alpine&tag=sha256:fa93b01658e3a5a1686dc3ae55f170d8de487006fb53a28efcd12ab0710a2e5f" '' 200

(Rats; I thought github would colorize the relevant character diff. s/=/~/ in the .error check)

Signed-off-by: Milivoje Legenovic <m.legenovic@gmail.com>
@mlegenovic
Copy link
Contributor Author

@edsantiago Thanks for the hint, it works.

@rhatdan
Copy link
Member

rhatdan commented Feb 26, 2021

LGTM
@containers/podman-maintainers PTAL

Copy link
Member

@vrothberg vrothberg left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Mar 1, 2021
@openshift-merge-robot openshift-merge-robot merged commit b154c51 into containers:master Mar 1, 2021
@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.

7 participants