3 files changed, 4 insertions, 46 deletions
diff --git a/pkg/bindings/test/attach_test.go b/pkg/bindings/test/attach_test.go
index 906bd2950..6fb166828 100644
--- a/pkg/bindings/test/attach_test.go
+++ b/pkg/bindings/test/attach_test.go
@@ -54,7 +54,7 @@ var _ = Describe("Podman containers attach", func() {
 		go func() {
 			defer GinkgoRecover()
 
-			err := containers.Attach(bt.conn, id, nil, bindings.PTrue, bindings.PTrue, nil, stdout, stderr)
+			err := containers.Attach(bt.conn, id, nil, bindings.PTrue, bindings.PTrue, nil, stdout, stderr, nil)
 			Expect(err).ShouldNot(HaveOccurred())
 		}()
 
@@ -98,7 +98,7 @@ var _ = Describe("Podman containers attach", func() {
 		go func() {
 			defer GinkgoRecover()
 
-			err := containers.Attach(bt.conn, ctnr.ID, nil, bindings.PFalse, bindings.PTrue, stdin, stdout, stderr)
+			err := containers.Attach(bt.conn, ctnr.ID, nil, bindings.PFalse, bindings.PTrue, stdin, stdout, stderr, nil)
 			Expect(err).ShouldNot(HaveOccurred())
 		}()
 
diff --git a/pkg/bindings/test/containers_test.go b/pkg/bindings/test/containers_test.go
index f725d1cf2..3b94b10eb 100644
--- a/pkg/bindings/test/containers_test.go
+++ b/pkg/bindings/test/containers_test.go
@@ -378,9 +378,9 @@ var _ = Describe("Podman containers ", func() {
 			containers.Logs(bt.conn, r.ID, opts, stdoutChan, nil)
 		}()
 		o := <-stdoutChan
-		o = strings.ReplaceAll(o, "\r", "")
+		o = strings.TrimSpace(o)
 		_, err = time.Parse(time.RFC1123Z, o)
-		Expect(err).To(BeNil())
+		Expect(err).ShouldNot(HaveOccurred())
 	})
 
 	It("podman top", func() {
diff --git a/pkg/bindings/test/system_test.go b/pkg/bindings/test/system_test.go
index fb2df258b..27ab2f555 100644
--- a/pkg/bindings/test/system_test.go
+++ b/pkg/bindings/test/system_test.go
@@ -5,7 +5,6 @@ import (
 
 	"github.com/containers/libpod/pkg/bindings"
 	"github.com/containers/libpod/pkg/bindings/containers"
-	"github.com/containers/libpod/pkg/bindings/images"
 	"github.com/containers/libpod/pkg/bindings/pods"
 	"github.com/containers/libpod/pkg/bindings/system"
 	"github.com/containers/libpod/pkg/bindings/volumes"
@@ -150,45 +149,4 @@ var _ = Describe("Podman system", func() {
 		// Volume should be pruned now as flag set true
 		Expect(len(systemPruneResponse.VolumePruneReport)).To(Equal(1))
 	})
-
-	It("podman system reset", func() {
-		// Adding an unused volume should work
-		_, err := volumes.Create(bt.conn, entities.VolumeCreateOptions{})
-		Expect(err).To(BeNil())
-
-		vols, err := volumes.List(bt.conn, nil)
-		Expect(err).To(BeNil())
-		Expect(len(vols)).To(Equal(1))
-
-		// Start a pod and leave it running
-		_, err = pods.Start(bt.conn, newpod)
-		Expect(err).To(BeNil())
-
-		imageSummary, err := images.List(bt.conn, nil, nil)
-		Expect(err).To(BeNil())
-		// Since in the begin context images are created
-		Expect(len(imageSummary)).To(Equal(3))
-
-		err = system.Reset(bt.conn)
-		Expect(err).To(BeNil())
-
-		// re-establish connection
-		s = bt.startAPIService()
-		time.Sleep(1 * time.Second)
-
-		// No pods
-		podSummary, err := pods.List(bt.conn, nil)
-		Expect(err).To(BeNil())
-		Expect(len(podSummary)).To(Equal(0))
-
-		// No images
-		imageSummary, err = images.List(bt.conn, bindings.PTrue, nil)
-		Expect(err).To(BeNil())
-		Expect(len(imageSummary)).To(Equal(0))
-
-		// no volumes
-		vols, err = volumes.List(bt.conn, nil)
-		Expect(err).To(BeNil())
-		Expect(len(vols)).To(BeZero())
-	})
 })