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

Attempt to turn on some more remote tests #7845

Merged
merged 1 commit into from
Oct 7, 2020

Conversation

rhatdan
Copy link
Member

@rhatdan rhatdan commented Sep 30, 2020

Signed-off-by: Daniel J Walsh dwalsh@redhat.com

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rhatdan

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 Sep 30, 2020
@rhatdan rhatdan force-pushed the remote branch 13 times, most recently from 26b4f0a to 4b7a8c4 Compare October 5, 2020 20:41
@rhatdan
Copy link
Member Author

rhatdan commented Oct 7, 2020

@containers/podman-maintainers PTAL
This one looks like it is finally able to go in.
@edsantiago Turns on a bunch of tests to make you happy. :^)
Also explains why some Remote tests have to be skipped.
Finally diagnosed a few more podman-remote failures, that still need to be worked on.

Expect(podman1.ExitCode()).To(Equal(125))
Expect(podman1.ErrorToString()).To(ContainSubstring("unknown flag: --namespace"))
return
}
Copy link
Member

Choose a reason for hiding this comment

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

Silly question, but why not move the if IsRemote() down a couple of lines, and avoid duplicating the command & wait?

    podman1.WaitWithDefaultTimeout()
    if IsRemote() {
        Expect(125) // and message
    } else {
        Expect(0)  // and message
    }

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

SkipIfRemote("FIXME, We should check that --env-host reports correct error on podman-remote")
if IsRemote() {
env := append(os.Environ(), "FOO=BAR")
session := podmanTest.PodmanAsUser([]string{"run", "--rm", "--env-host", ALPINE, "/bin/printenv", "FOO"}, 0, 0, "", env)
Copy link
Member

Choose a reason for hiding this comment

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

Similar to above, can we eliminate some duplication?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
@@ -237,7 +237,7 @@ registries = ['{{.Host}}:{{.Port}}']`
})

It("podman search attempts HTTP if registry is in registries.insecure and force secure is false", func() {
SkipIfRemote("FIXME This should work on podman-remote")
SkipIfRemote("--tls-verify is not supportedon podman-remote search")
Copy link
Member

Choose a reason for hiding this comment

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

[not worth re-pushing; please fix only if something else merits it] : "supportedon" needs space. Also lines 281, 320 below.

if is_remote; then
ENVHOST=""
else
ENVHOST="--env-host"
Copy link
Member

Choose a reason for hiding this comment

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

[another not-worth-pushing-just-for-this]: inconsistent indentation

Comment on lines +51 to +54
session = podmanTest.Podman([]string{"images", "-q"})
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
totImages := strconv.Itoa(len(session.OutputToStringArray()))
Copy link
Member

Choose a reason for hiding this comment

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

Thank you! That has bitten us before.

Purely out of curiosity, is it ever possible for this number to be different from podman info --format '{{.Store.ImageStore.Number}}'?

@edsantiago
Copy link
Member

This must've been incredibly tedious, iterating over and over so many tests. It is much appreciated. LGTM.

@edsantiago
Copy link
Member

/lgtm
/hold

@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 Oct 7, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 7, 2020
@rhatdan
Copy link
Member Author

rhatdan commented Oct 7, 2020

/hold cancel

@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 Oct 7, 2020
@openshift-merge-robot openshift-merge-robot merged commit ce93ab3 into containers:master Oct 7, 2020
@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 24, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 24, 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.

4 participants