From df1c14dfd2dca5feccb6d292a1de647277bcbb2b Mon Sep 17 00:00:00 2001
From: Sally O'Malley <somalley@redhat.com>
Date: Wed, 2 Dec 2015 13:48:59 -0500
Subject: [PATCH] don't return error if can't delete non-existing container

Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: bfa5027e96a6a5532c7cc89bd00be219082833fa
Component: engine
---
 components/engine/integration-cli/docker_utils.go | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/components/engine/integration-cli/docker_utils.go b/components/engine/integration-cli/docker_utils.go
index 1915995e0b..d0b54aa27c 100644
--- a/components/engine/integration-cli/docker_utils.go
+++ b/components/engine/integration-cli/docker_utils.go
@@ -627,8 +627,10 @@ func deleteAllContainers() error {
 		return err
 	}
 
-	if err = deleteContainer(containers); err != nil {
-		return err
+	if containers != "" {
+		if err = deleteContainer(containers); err != nil {
+			return err
+		}
 	}
 	return nil
 }