summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthew Heon <matthew.heon@pm.me>2019-06-24 15:23:38 -0400
committerMatthew Heon <matthew.heon@pm.me>2019-06-24 15:27:37 -0400
commit79d835457da1b3498c355f0200b7d02d1069415f (patch)
treebc05d9c079e30e921bfecee56ff012afff32049f /test
parent803a2b04d17165a57b31d135368a08eace370e5b (diff)
downloadpodman-79d835457da1b3498c355f0200b7d02d1069415f.tar.gz
podman-79d835457da1b3498c355f0200b7d02d1069415f.tar.bz2
podman-79d835457da1b3498c355f0200b7d02d1069415f.zip
Fix tests
Signed-off-by: Matthew Heon <matthew.heon@pm.me>
Diffstat (limited to 'test')
-rw-r--r--test/e2e/generate_kube_test.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/test/e2e/generate_kube_test.go b/test/e2e/generate_kube_test.go
index 4a14bddfa..7871546c7 100644
--- a/test/e2e/generate_kube_test.go
+++ b/test/e2e/generate_kube_test.go
@@ -59,7 +59,7 @@ var _ = Describe("Podman generate kube", func() {
Expect(kube.ExitCode()).To(Equal(0))
pod := new(v1.Pod)
- err := yaml.Unmarshal(kube.OutputToString(), pod)
+ err := yaml.Unmarshal([]byte(kube.OutputToString()), pod)
Expect(err).To(BeNil())
})
@@ -73,7 +73,7 @@ var _ = Describe("Podman generate kube", func() {
Expect(kube.ExitCode()).To(Equal(0))
pod := new(v1.Pod)
- err := yaml.Unmarshal(kube.OutputToString(), pod)
+ err := yaml.Unmarshal([]byte(kube.OutputToString()), pod)
Expect(err).To(BeNil())
})
@@ -90,7 +90,7 @@ var _ = Describe("Podman generate kube", func() {
Expect(kube.ExitCode()).To(Equal(0))
pod := new(v1.Pod)
- err := yaml.Unmarshal(kube.OutputToString(), pod)
+ err := yaml.Unmarshal([]byte(kube.OutputToString()), pod)
Expect(err).To(BeNil())
})
@@ -114,17 +114,17 @@ var _ = Describe("Podman generate kube", func() {
It("podman generate kube on pod with ports", func() {
podName := "test"
- podSession := podmanTest.Podman("pod", "create", "--name", podName, "-p", "4000:4000", "-p", "5000:5000")
+ podSession := podmanTest.Podman([]string{"pod", "create", "--name", podName, "-p", "4000:4000", "-p", "5000:5000"})
podSession.WaitWithDefaultTimeout()
Expect(podSession.ExitCode()).To(Equal(0))
ctr1Name := "ctr1"
- ctr1Session := podmanTest.Podman("create", "--name", ctr1Name, "--pod", podName, ALPINE, "top")
+ ctr1Session := podmanTest.Podman([]string{"create", "--name", ctr1Name, "--pod", podName, ALPINE, "top"})
ctr1Session.WaitWithDefaultTimeout()
Expect(ctr1Session.ExitCode()).To(Equal(0))
ctr2Name := "ctr2"
- ctr2Session := podmanTest.Podman("create", "--name", ctr2Name, "--pod", podName, ALPINE, "top")
+ ctr2Session := podmanTest.Podman([]string{"create", "--name", ctr2Name, "--pod", podName, ALPINE, "top"})
ctr2Session.WaitWithDefaultTimeout()
Expect(ctr2Session.ExitCode()).To(Equal(0))
@@ -133,7 +133,7 @@ var _ = Describe("Podman generate kube", func() {
Expect(kube.ExitCode()).To(Equal(0))
pod := new(v1.Pod)
- err := yaml.Unmarshal(kube.OutputToString(), pod)
+ err := yaml.Unmarshal([]byte(kube.OutputToString()), pod)
Expect(err).To(BeNil())
foundPort4000 := 0