Merge pull request containers#12177 from Luap99/log-test

Fix bindings container log test
jwhonce · Nov 4, 2021 · 28bbd14 · 28bbd14
2 parents c0351a7 + ba8eba8
commit 28bbd14
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/pkg/bindings/containers/attach.go b/pkg/bindings/containers/attach.go
@@ -214,7 +214,7 @@ func Attach(ctx context.Context, nameOrID string, stdin io.Reader, stdout io.Wri
 			// Read multiplexed channels and write to appropriate stream
 			fd, l, err := DemuxHeader(socket, buffer)
 			if err != nil {
-				if errors.Is(err, io.EOF) {
+				if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
 					return nil
 				}
 				return err
@@ -531,7 +531,7 @@ func ExecStartAndAttach(ctx context.Context, sessionID string, options *ExecStar
 			// Read multiplexed channels and write to appropriate stream
 			fd, l, err := DemuxHeader(socket, buffer)
 			if err != nil {
-				if errors.Is(err, io.EOF) {
+				if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
 					return nil
 				}
 				return err

diff --git a/pkg/bindings/containers/logs.go b/pkg/bindings/containers/logs.go
@@ -39,7 +39,7 @@ func Logs(ctx context.Context, nameOrID string, options *LogOptions, stdoutChan,
 	for {
 		fd, l, err := DemuxHeader(response.Body, buffer)
 		if err != nil {
-			if errors.Is(err, io.EOF) {
+			if errors.Is(err, io.EOF) || errors.Is(err, io.ErrUnexpectedEOF) {
 				return nil
 			}
 			return err

diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
@@ -259,6 +259,7 @@ var _ = Describe("Podman containers ", func() {
 		_, err = bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		go func() {
+			defer GinkgoRecover()
 			exitCode, err = containers.Wait(bt.conn, name, nil)
 			errChan <- err
 			close(errChan)
@@ -281,6 +282,7 @@ var _ = Describe("Podman containers ", func() {
 		_, err := bt.RunTopContainer(&name, nil)
 		Expect(err).To(BeNil())
 		go func() {
+			defer GinkgoRecover()
 			exitCode, err = containers.Wait(bt.conn, name, new(containers.WaitOptions).WithCondition([]define.ContainerStatus{pause}))
 			errChan <- err
 			close(errChan)
@@ -366,7 +368,10 @@ var _ = Describe("Podman containers ", func() {
 
 		opts := new(containers.LogOptions).WithStdout(true).WithFollow(true)
 		go func() {
-			containers.Logs(bt.conn, r.ID, opts, stdoutChan, nil)
+			defer GinkgoRecover()
+			err := containers.Logs(bt.conn, r.ID, opts, stdoutChan, nil)
+			close(stdoutChan)
+			Expect(err).ShouldNot(HaveOccurred())
 		}()
 		o := <-stdoutChan
 		o = strings.TrimSpace(o)