summaryrefslogtreecommitdiff
path: root/pkg/bindings/test
diff options
context:
space:
mode:
authorbaude <bbaude@redhat.com>2021-01-18 09:29:40 -0600
committerbaude <bbaude@redhat.com>2021-01-18 13:48:51 -0600
commit4ccb0729b4f0a25eb53f62c2f6ca7f8925f0fe4e (patch)
treeed2003809730d195c95905cf4c307a8e9047d2d0 /pkg/bindings/test
parent5b3c7a52939275784c45c9747dd5864bd0581ff5 (diff)
downloadpodman-4ccb0729b4f0a25eb53f62c2f6ca7f8925f0fe4e.tar.gz
podman-4ccb0729b4f0a25eb53f62c2f6ca7f8925f0fe4e.tar.bz2
podman-4ccb0729b4f0a25eb53f62c2f6ca7f8925f0fe4e.zip
Add binding options for container|pod exists
It turns out an options was added to container exists so it makes sense to have pods and container exists calls have an optional structure for options. Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/bindings/test')
-rw-r--r--pkg/bindings/test/containers_test.go12
-rw-r--r--pkg/bindings/test/images_test.go20
-rw-r--r--pkg/bindings/test/pods_test.go6
3 files changed, 19 insertions, 19 deletions
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index fa601e7e5..3d7526cb8 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -406,7 +406,7 @@ var _ = Describe("Podman containers ", func() {
It("podman bogus container does not exist in local storage", func() {
// Bogus container existence check should fail
- containerExists, err := containers.Exists(bt.conn, "foobar", false)
+ containerExists, err := containers.Exists(bt.conn, "foobar", nil)
Expect(err).To(BeNil())
Expect(containerExists).To(BeFalse())
})
@@ -416,7 +416,7 @@ var _ = Describe("Podman containers ", func() {
var name = "top"
_, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
Expect(err).To(BeNil())
- containerExists, err := containers.Exists(bt.conn, name, false)
+ containerExists, err := containers.Exists(bt.conn, name, nil)
Expect(err).To(BeNil())
Expect(containerExists).To(BeTrue())
})
@@ -426,7 +426,7 @@ var _ = Describe("Podman containers ", func() {
var name = "top"
cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
Expect(err).To(BeNil())
- containerExists, err := containers.Exists(bt.conn, cid, false)
+ containerExists, err := containers.Exists(bt.conn, cid, nil)
Expect(err).To(BeNil())
Expect(containerExists).To(BeTrue())
})
@@ -436,7 +436,7 @@ var _ = Describe("Podman containers ", func() {
var name = "top"
cid, err := bt.RunTopContainer(&name, bindings.PFalse, nil)
Expect(err).To(BeNil())
- containerExists, err := containers.Exists(bt.conn, cid[0:12], false)
+ containerExists, err := containers.Exists(bt.conn, cid[0:12], nil)
Expect(err).To(BeNil())
Expect(containerExists).To(BeTrue())
})
@@ -456,7 +456,7 @@ var _ = Describe("Podman containers ", func() {
Expect(err).To(BeNil())
err = containers.Kill(bt.conn, name, "SIGINT", nil)
Expect(err).To(BeNil())
- _, err = containers.Exists(bt.conn, name, false)
+ _, err = containers.Exists(bt.conn, name, nil)
Expect(err).To(BeNil())
})
@@ -467,7 +467,7 @@ var _ = Describe("Podman containers ", func() {
Expect(err).To(BeNil())
err = containers.Kill(bt.conn, cid, "SIGTERM", nil)
Expect(err).To(BeNil())
- _, err = containers.Exists(bt.conn, cid, false)
+ _, err = containers.Exists(bt.conn, cid, nil)
Expect(err).To(BeNil())
})
diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go
index 81959e813..f94960047 100644
--- a/pkg/bindings/test/images_test.go
+++ b/pkg/bindings/test/images_test.go
@@ -194,17 +194,17 @@ var _ = Describe("Podman images", func() {
It("Image Exists", func() {
// exists on bogus image should be false, with no error
- exists, err := images.Exists(bt.conn, "foobar")
+ exists, err := images.Exists(bt.conn, "foobar", nil)
Expect(err).To(BeNil())
Expect(exists).To(BeFalse())
// exists with shortname should be true
- exists, err = images.Exists(bt.conn, alpine.shortName)
+ exists, err = images.Exists(bt.conn, alpine.shortName, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeTrue())
// exists with fqname should be true
- exists, err = images.Exists(bt.conn, alpine.name)
+ exists, err = images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeTrue())
})
@@ -213,7 +213,7 @@ var _ = Describe("Podman images", func() {
// load an image
_, errs := images.Remove(bt.conn, []string{alpine.name}, nil)
Expect(len(errs)).To(BeZero())
- exists, err := images.Exists(bt.conn, alpine.name)
+ exists, err := images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeFalse())
f, err := os.Open(filepath.Join(ImageCacheDir, alpine.tarballName))
@@ -222,7 +222,7 @@ var _ = Describe("Podman images", func() {
names, err := images.Load(bt.conn, f)
Expect(err).To(BeNil())
Expect(names.Names[0]).To(Equal(alpine.name))
- exists, err = images.Exists(bt.conn, alpine.name)
+ exists, err = images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeTrue())
@@ -231,7 +231,7 @@ var _ = Describe("Podman images", func() {
Expect(err).To(BeNil())
_, errs = images.Remove(bt.conn, []string{alpine.name}, nil)
Expect(len(errs)).To(BeZero())
- exists, err = images.Exists(bt.conn, alpine.name)
+ exists, err = images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeFalse())
names, err = images.Load(bt.conn, f)
@@ -243,7 +243,7 @@ var _ = Describe("Podman images", func() {
Expect(err).To(BeNil())
_, errs = images.Remove(bt.conn, []string{alpine.name}, nil)
Expect(len(errs)).To(BeZero())
- exists, err = images.Exists(bt.conn, alpine.name)
+ exists, err = images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeFalse())
})
@@ -266,7 +266,7 @@ var _ = Describe("Podman images", func() {
// load an image
_, errs := images.Remove(bt.conn, []string{alpine.name}, nil)
Expect(len(errs)).To(BeZero())
- exists, err := images.Exists(bt.conn, alpine.name)
+ exists, err := images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeFalse())
f, err := os.Open(filepath.Join(ImageCacheDir, alpine.tarballName))
@@ -277,7 +277,7 @@ var _ = Describe("Podman images", func() {
options := new(images.ImportOptions).WithMessage(testMessage).WithChanges(changes).WithReference(alpine.name)
_, err = images.Import(bt.conn, f, options)
Expect(err).To(BeNil())
- exists, err = images.Exists(bt.conn, alpine.name)
+ exists, err = images.Exists(bt.conn, alpine.name, nil)
Expect(err).To(BeNil())
Expect(exists).To(BeTrue())
data, err := images.GetImage(bt.conn, alpine.name, nil)
@@ -357,7 +357,7 @@ var _ = Describe("Podman images", func() {
Expect(err).NotTo(HaveOccurred())
Expect(len(pulledImages)).To(Equal(1))
- exists, err := images.Exists(bt.conn, rawImage)
+ exists, err := images.Exists(bt.conn, rawImage, nil)
Expect(err).NotTo(HaveOccurred())
Expect(exists).To(BeTrue())
diff --git a/pkg/bindings/test/pods_test.go b/pkg/bindings/test/pods_test.go
index 38c5997ef..058479c26 100644
--- a/pkg/bindings/test/pods_test.go
+++ b/pkg/bindings/test/pods_test.go
@@ -157,12 +157,12 @@ var _ = Describe("Podman pods", func() {
// The test validates if the exists responds
It("exists pod", func() {
- response, err := pods.Exists(bt.conn, "dummyName")
+ response, err := pods.Exists(bt.conn, "dummyName", nil)
Expect(err).To(BeNil())
Expect(response).To(BeFalse())
// Should exit with no error and response should be true
- response, err = pods.Exists(bt.conn, "newpod")
+ response, err = pods.Exists(bt.conn, "newpod", nil)
Expect(err).To(BeNil())
Expect(response).To(BeTrue())
})
@@ -338,7 +338,7 @@ var _ = Describe("Podman pods", func() {
_, err := pods.CreatePodFromSpec(bt.conn, &ps, nil)
Expect(err).To(BeNil())
- exists, err := pods.Exists(bt.conn, "foobar")
+ exists, err := pods.Exists(bt.conn, "foobar", nil)
Expect(err).To(BeNil())
Expect(exists).To(BeTrue())
})