2 files changed, 104 insertions, 0 deletions
diff --git a/test/e2e/attach_test.go b/test/e2e/attach_test.go
index c728f482d..a843fe7ff 100644
--- a/test/e2e/attach_test.go
+++ b/test/e2e/attach_test.go
@@ -4,6 +4,8 @@ package integration
 
 import (
 	"os"
+	"syscall"
+	"time"
 
 	. "github.com/containers/libpod/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -73,4 +75,44 @@ var _ = Describe("Podman attach", func() {
 		results.WaitWithDefaultTimeout()
 		Expect(results.ExitCode()).To(Equal(125))
 	})
+
+	It("podman attach to a running container", func() {
+		session := podmanTest.Podman([]string{"run", "-d", "--name", "test", ALPINE, "/bin/sh", "-c", "while true; do echo test; sleep 1; done"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		results := podmanTest.Podman([]string{"attach", "test"})
+		time.Sleep(2 * time.Second)
+		results.Signal(syscall.SIGTSTP)
+		Expect(results.OutputToString()).To(ContainSubstring("test"))
+		Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
+	})
+	It("podman attach to the latest container", func() {
+		session := podmanTest.Podman([]string{"run", "-d", "--name", "test1", ALPINE, "/bin/sh", "-c", "while true; do echo test1; sleep 1; done"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"run", "-d", "--name", "test2", ALPINE, "/bin/sh", "-c", "while true; do echo test2; sleep 1; done"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		results := podmanTest.Podman([]string{"attach", "-l"})
+		time.Sleep(2 * time.Second)
+		results.Signal(syscall.SIGTSTP)
+		Expect(results.OutputToString()).To(ContainSubstring("test2"))
+		Expect(podmanTest.NumberOfContainersRunning()).To(Equal(2))
+	})
+
+	It("podman attach to a container with --sig-proxy set to false", func() {
+		session := podmanTest.Podman([]string{"run", "-d", "--name", "test", ALPINE, "/bin/sh", "-c", "while true; do echo test; sleep 1; done"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		results := podmanTest.Podman([]string{"attach", "--sig-proxy=false", "test"})
+		time.Sleep(2 * time.Second)
+		results.Signal(syscall.SIGTERM)
+		results.WaitWithDefaultTimeout()
+		Expect(results.OutputToString()).To(ContainSubstring("test"))
+		Expect(podmanTest.NumberOfContainersRunning()).To(Equal(1))
+	})
 })
diff --git a/test/e2e/system_df_test.go b/test/e2e/system_df_test.go
new file mode 100644
index 000000000..92787f17c
--- /dev/null
+++ b/test/e2e/system_df_test.go
@@ -0,0 +1,62 @@
+// +build !remoteclient
+
+package integration
+
+import (
+	"fmt"
+	"os"
+	"strings"
+
+	. "github.com/containers/libpod/test/utils"
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("podman system df", func() {
+	var (
+		tempdir    string
+		err        error
+		podmanTest *PodmanTestIntegration
+	)
+
+	BeforeEach(func() {
+		tempdir, err = CreateTempDirInTempDir()
+		if err != nil {
+			os.Exit(1)
+		}
+		podmanTest = PodmanTestCreate(tempdir)
+		podmanTest.RestoreAllArtifacts()
+	})
+
+	AfterEach(func() {
+		podmanTest.Cleanup()
+		f := CurrentGinkgoTestDescription()
+		timedResult := fmt.Sprintf("Test: %s completed in %f seconds", f.TestText, f.Duration.Seconds())
+		GinkgoWriter.Write([]byte(timedResult))
+	})
+
+	It("podman system df", func() {
+		session := podmanTest.Podman([]string{"create", ALPINE})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"volume", "create", "data"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"create", "-v", "data:/data", "--name", "container1", "busybox"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		session = podmanTest.Podman([]string{"system", "df"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+		Expect(len(session.OutputToStringArray())).To(Equal(4))
+		images := strings.Fields(session.OutputToStringArray()[1])
+		containers := strings.Fields(session.OutputToStringArray()[2])
+		volumes := strings.Fields(session.OutputToStringArray()[3])
+		Expect(images[1]).To(Equal("2"))
+		Expect(containers[1]).To(Equal("2"))
+		Expect(volumes[2]).To(Equal("1"))
+	})
+})