summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authortheunrealgeek <theunrealgeek@gmail.com>2020-05-30 12:20:32 -0700
committertheunrealgeek <theunrealgeek@gmail.com>2020-06-02 20:33:16 -0700
commit5330ce9876922fcdc8a11d92625cd94235ab0fb6 (patch)
tree9554b89d47e9aada0731887d3eb055e768a8f556 /test
parentc739b58ad55e776687f353fd75c3807a357f9ad7 (diff)
downloadpodman-5330ce9876922fcdc8a11d92625cd94235ab0fb6.tar.gz
podman-5330ce9876922fcdc8a11d92625cd94235ab0fb6.tar.bz2
podman-5330ce9876922fcdc8a11d92625cd94235ab0fb6.zip
Fix podman generate tests that relied on play kube
Signed-off-by: Aditya Kamath <theunrealgeek@gmail.com>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/generate_kube_test.go6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 389f2c822..395cc1ea4 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -280,7 +280,8 @@ var _ = Describe("Podman generate kube", func() {
session.WaitWithDefaultTimeout()
Expect(session.ExitCode()).To(Equal(0))
- inspect1 := podmanTest.Podman([]string{"inspect", "--format", "{{.Config.User}}", "test1"})
+ // container name in pod is <podName>-<ctrName>
+ inspect1 := podmanTest.Podman([]string{"inspect", "--format", "{{.Config.User}}", "toppod-test1"})
inspect1.WaitWithDefaultTimeout()
Expect(inspect1.ExitCode()).To(Equal(0))
Expect(inspect1.OutputToString()).To(ContainSubstring(inspect.OutputToString()))
@@ -293,6 +294,7 @@ var _ = Describe("Podman generate kube", func() {
// we need a container name because IDs don't persist after rm/play
ctrName := "test-ctr"
+ ctrNameInKubePod := "test1-test-ctr"
session1 := podmanTest.Podman([]string{"run", "-d", "--pod", "new:test1", "--name", ctrName, "-v", vol1 + ":/volume/:z", "alpine", "top"})
session1.WaitWithDefaultTimeout()
@@ -311,7 +313,7 @@ var _ = Describe("Podman generate kube", func() {
play.WaitWithDefaultTimeout()
Expect(play.ExitCode()).To(Equal(0))
- inspect := podmanTest.Podman([]string{"inspect", ctrName})
+ inspect := podmanTest.Podman([]string{"inspect", ctrNameInKubePod})
inspect.WaitWithDefaultTimeout()
Expect(inspect.ExitCode()).To(Equal(0))
Expect(inspect.OutputToString()).To(ContainSubstring(vol1))