diff options
author | Brent Baude <bbaude@redhat.com> | 2020-01-29 11:23:03 -0600 |
---|---|---|
committer | Brent Baude <bbaude@redhat.com> | 2020-01-29 12:41:39 -0600 |
commit | a8b4e986f774da48a74d84e29fb31069bb13f43a (patch) | |
tree | 89059b0f3da74c23443984eeb7767bb99e3ba9fa /pkg/bindings/test | |
parent | 66bb873390badc4ad88620d211de09b4668d1cd5 (diff) | |
download | podman-a8b4e986f774da48a74d84e29fb31069bb13f43a.tar.gz podman-a8b4e986f774da48a74d84e29fb31069bb13f43a.tar.bz2 podman-a8b4e986f774da48a74d84e29fb31069bb13f43a.zip |
apiv2 binding test fixes
a recent refactor in the bindings broke the tests. quick fixes to get them working again.
Signed-off-by: Brent Baude <bbaude@redhat.com>
Diffstat (limited to 'pkg/bindings/test')
-rw-r--r-- | pkg/bindings/test/common_test.go | 1 | ||||
-rw-r--r-- | pkg/bindings/test/images_test.go | 10 | ||||
-rw-r--r-- | pkg/bindings/test/test_suite_test.go | 13 |
3 files changed, 19 insertions, 5 deletions
diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index 4f2a98f2b..e3e66c89f 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -15,6 +15,7 @@ import ( const ( defaultPodmanBinaryLocation string = "/usr/bin/podman" + alpine string = "docker.io/library/alpine:latest" ) type bindingTest struct { diff --git a/pkg/bindings/test/images_test.go b/pkg/bindings/test/images_test.go index d600197bb..2906d55cd 100644 --- a/pkg/bindings/test/images_test.go +++ b/pkg/bindings/test/images_test.go @@ -34,7 +34,7 @@ var _ = Describe("Podman images", func() { //podmanTest.Setup() //podmanTest.SeedImages() bt = newBindingTest() - p := bt.runPodman([]string{"pull", "docker.io/library/alpine:latest"}) + p := bt.runPodman([]string{"pull", alpine}) p.Wait(45) s = bt.startAPIService() time.Sleep(1 * time.Second) @@ -68,13 +68,13 @@ var _ = Describe("Podman images", func() { _, err = images.GetImage(connText, data.ID[0:12], nil) Expect(err).To(BeNil()) // Inspect by ID - // Inspect by long name should work, it doesnt (yet) i think it needs to be html escaped - //_, err = images.GetImage(connText, ) + //Inspect by long name should work, it doesnt (yet) i think it needs to be html escaped + //_, err = images.GetImage(connText, alpine, nil) //Expect(err).To(BeNil()) }) It("remove image", func() { // Remove invalid image should be a 404 - _, err = images.RemoveImage(connText, "foobar5000", &false) + _, err = images.Remove(connText, "foobar5000", &false) Expect(err).ToNot(BeNil()) code, _ := bindings.CheckResponseCode(err) Expect(code).To(BeNumerically("==", 404)) @@ -82,7 +82,7 @@ var _ = Describe("Podman images", func() { _, err := images.GetImage(connText, "alpine", nil) Expect(err).To(BeNil()) - response, err := images.RemoveImage(connText, "alpine", &false) + response, err := images.Remove(connText, "alpine", &false) Expect(err).To(BeNil()) fmt.Println(response) // to be continued diff --git a/pkg/bindings/test/test_suite_test.go b/pkg/bindings/test/test_suite_test.go new file mode 100644 index 000000000..dc2b49b88 --- /dev/null +++ b/pkg/bindings/test/test_suite_test.go @@ -0,0 +1,13 @@ +package test_bindings_test + +import ( + "testing" + + . "github.com/onsi/ginkgo" + . "github.com/onsi/gomega" +) + +func TestTest(t *testing.T) { + RegisterFailHandler(Fail) + RunSpecs(t, "Test Suite") +} |