diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-22 15:14:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-22 15:14:38 +0100 |
| commit | 901066acd113ee3bea709cc558d86c4c438e2f67 (patch) | |
| tree | 018a8f7918b50e9d1bc58f7ce9a981f628c3d295 /pkg/bindings | |
| parent | fc963159b8078c7e3ca6571174fb3a82d1023b43 (diff) | |
| parent | 06dd9136a253521cb74497a59f2e6894806a5b6d (diff) | |
| download | podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.gz podman-901066acd113ee3bea709cc558d86c4c438e2f67.tar.bz2 podman-901066acd113ee3bea709cc558d86c4c438e2f67.zip | |
Merge pull request #13580 from vrothberg/enable-linters
enable linters
Diffstat (limited to 'pkg/bindings')
| -rw-r--r-- | pkg/bindings/containers/attach.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/test/attach_test.go | 3 | ||||
| -rw-r--r-- | pkg/bindings/test/auth_test.go | 3 | ||||
| -rw-r--r-- | pkg/bindings/test/common_test.go | 2 | ||||
| -rw-r--r-- | pkg/bindings/test/containers_test.go | 3 |
5 files changed, 8 insertions, 5 deletions
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go index f410606e4..0c6ebdd2f 100644 --- a/pkg/bindings/containers/attach.go +++ b/pkg/bindings/containers/attach.go @@ -279,7 +279,7 @@ func DemuxFrame(r io.Reader, buffer []byte, length int) (frame []byte, err error n, err := io.ReadFull(r, buffer[0:length]) if err != nil { - return nil, nil + return nil, err } if n < length { err = io.ErrUnexpectedEOF diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go index 670566882..dcebe0809 100644 --- a/pkg/bindings/test/attach_test.go +++ b/pkg/bindings/test/attach_test.go @@ -44,7 +44,8 @@ var _ = Describe("Podman containers attach", func() { timeout := uint(5) err := containers.Stop(bt.conn, id, new(containers.StopOptions).WithTimeout(timeout)) if err != nil { - GinkgoWriter.Write([]byte(err.Error())) + _, writeErr := GinkgoWriter.Write([]byte(err.Error())) + Expect(writeErr).ShouldNot(HaveOccurred()) } }() diff --git a/pkg/bindings/test/auth_test.go b/pkg/bindings/test/auth_test.go index b421f0797..c4c4b16d8 100644 --- a/pkg/bindings/test/auth_test.go +++ b/pkg/bindings/test/auth_test.go @@ -40,7 +40,8 @@ var _ = Describe("Podman images", func() { AfterEach(func() { s.Kill() bt.cleanup() - registry.Stop() + err := registry.Stop() + Expect(err).To(BeNil()) }) // Test using credentials. diff --git a/pkg/bindings/test/common_test.go b/pkg/bindings/test/common_test.go index f51e5f404..f2602967b 100644 --- a/pkg/bindings/test/common_test.go +++ b/pkg/bindings/test/common_test.go @@ -211,7 +211,7 @@ func (b *bindingTest) RunTopContainer(containerName *string, podName *string) (s } ctr, err := containers.CreateWithSpec(b.conn, s, nil) if err != nil { - return "", nil + return "", err } err = containers.Start(b.conn, ctr.ID, nil) if err != nil { diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go index 9411d8a5f..bf627fdba 100644 --- a/pkg/bindings/test/containers_test.go +++ b/pkg/bindings/test/containers_test.go @@ -322,7 +322,8 @@ var _ = Describe("Podman containers ", func() { // a container that has no healthcheck should be a 409 var name = "top" - bt.RunTopContainer(&name, nil) + _, err = bt.RunTopContainer(&name, nil) + Expect(err).To(BeNil()) _, err = containers.RunHealthCheck(bt.conn, name, nil) Expect(err).ToNot(BeNil()) code, _ = bindings.CheckResponseCode(err) |