-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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
Conversation
[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 |
26b4f0a
to
4b7a8c4
Compare
@containers/podman-maintainers PTAL |
Expect(podman1.ExitCode()).To(Equal(125)) | ||
Expect(podman1.ErrorToString()).To(ContainSubstring("unknown flag: --namespace")) | ||
return | ||
} |
There was a problem hiding this comment.
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
}
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed
test/e2e/run_env_test.go
Outdated
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) |
There was a problem hiding this comment.
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?
There was a problem hiding this comment.
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 <[email protected]>
@@ -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") |
There was a problem hiding this comment.
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" |
There was a problem hiding this comment.
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
session = podmanTest.Podman([]string{"images", "-q"}) | ||
session.WaitWithDefaultTimeout() | ||
Expect(session.ExitCode()).To(Equal(0)) | ||
totImages := strconv.Itoa(len(session.OutputToStringArray())) |
There was a problem hiding this comment.
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}}'
?
This must've been incredibly tedious, iterating over and over so many tests. It is much appreciated. LGTM. |
/lgtm |
/hold cancel |
Signed-off-by: Daniel J Walsh [email protected]