From c3c2ba079d6a466236d8f1bbc9c6b0f6173dd408 Mon Sep 17 00:00:00 2001
From: Matthew Heon <mheon@redhat.com>
Date: Tue, 23 Apr 2019 13:15:24 -0400
Subject: Trim whitespace from ps -q before comparing

Signed-off-by: Matthew Heon <mheon@redhat.com>
---
 test/e2e/stop_test.go | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'test/e2e/stop_test.go')

diff --git a/test/e2e/stop_test.go b/test/e2e/stop_test.go
index 259410736..8f7bb2308 100644
--- a/test/e2e/stop_test.go
+++ b/test/e2e/stop_test.go
@@ -4,6 +4,7 @@ package integration
 
 import (
 	"os"
+	"strings"
 
 	. "github.com/containers/libpod/test/utils"
 	. "github.com/onsi/ginkgo"
@@ -52,7 +53,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop container by name", func() {
@@ -66,7 +67,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman container stop by name", func() {
@@ -80,7 +81,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop stopped container", func() {
@@ -99,7 +100,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop all containers -t", func() {
@@ -129,7 +130,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop container --time", func() {
@@ -147,7 +148,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop container --timeout", func() {
@@ -165,7 +166,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop latest containers", func() {
@@ -178,7 +179,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop all containers with one stopped", func() {
@@ -197,7 +198,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 	It("podman stop all containers with one created", func() {
@@ -213,7 +214,7 @@ var _ = Describe("Podman stop", func() {
 		finalCtrs := podmanTest.Podman([]string("ps", "-q"))
 		finalCtrs.WaitWithDefaultTimeout()
 		Expect(finalCtrs.ExitCode()).To(Equal(0))
-		Expect(finalCtrs.OutputToString()).To(Equal(""))
+		Expect(strings.TrimSpace(finalCtrs.OutputToString())).To(Equal(""))
 	})
 
 })
-- 
cgit v1.2.3-54-g00ecf