summaryrefslogtreecommitdiff
path: root/test/e2e
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-10-27 15:24:23 +0000
committerGitHub <noreply@github.com>2021-10-27 15:24:23 +0000
commitd908da51fbe0089074355850e7854e0c9502a35a (patch)
tree2f5cb93d514b0345043a44da9f0a681cbe532ae6 /test/e2e
parent6caf5e3b7c08cb3c5b62ed069e458910321b43b2 (diff)
parentff31f2264da1550be97055865dea639eb0882327 (diff)
downloadpodman-d908da51fbe0089074355850e7854e0c9502a35a.tar.gz
podman-d908da51fbe0089074355850e7854e0c9502a35a.tar.bz2
podman-d908da51fbe0089074355850e7854e0c9502a35a.zip
Merge pull request #12064 from vrothberg/fix-11933
container create: fix --tls-verify parsing
Diffstat (limited to 'test/e2e')
-rw-r--r--test/e2e/push_test.go4
-rw-r--r--test/e2e/run_test.go6
2 files changed, 8 insertions, 2 deletions
diff --git a/test/e2e/push_test.go b/test/e2e/push_test.go
index b7e8309fb..7b35acd35 100644
--- a/test/e2e/push_test.go
+++ b/test/e2e/push_test.go
@@ -146,7 +146,7 @@ var _ = Describe("Podman push", func() {
session = podmanTest.Podman([]string{"logs", "registry"})
session.WaitWithDefaultTimeout()
- push := podmanTest.Podman([]string{"push", "--format=v2s2", "--creds=podmantest:test", ALPINE, "localhost:5000/tlstest"})
+ push := podmanTest.Podman([]string{"push", "--tls-verify=true", "--format=v2s2", "--creds=podmantest:test", ALPINE, "localhost:5000/tlstest"})
push.WaitWithDefaultTimeout()
Expect(push).To(ExitWithError())
@@ -163,7 +163,7 @@ var _ = Describe("Podman push", func() {
if !IsRemote() {
// remote does not support --cert-dir
- push = podmanTest.Podman([]string{"push", "--creds=podmantest:test", "--cert-dir=fakedir", ALPINE, "localhost:5000/certdirtest"})
+ push = podmanTest.Podman([]string{"push", "--tls-verify=true", "--creds=podmantest:test", "--cert-dir=fakedir", ALPINE, "localhost:5000/certdirtest"})
push.WaitWithDefaultTimeout()
Expect(push).To(ExitWithError())
}
diff --git a/test/e2e/run_test.go b/test/e2e/run_test.go
index 8502879ff..2e0f626d0 100644
--- a/test/e2e/run_test.go
+++ b/test/e2e/run_test.go
@@ -188,6 +188,12 @@ var _ = Describe("Podman run", func() {
run.WaitWithDefaultTimeout()
Expect(run).Should(Exit(0))
Expect(podmanTest.NumberOfContainers()).To(Equal(3))
+
+ // Now registries.conf will be consulted where localhost:5000
+ // is set to be insecure.
+ run = podmanTest.Podman([]string{"run", ALPINE})
+ run.WaitWithDefaultTimeout()
+ Expect(run).Should(Exit(0))
})
It("podman run a container with a --rootfs", func() {