From 57ba7049631f3018edf621826ecbd07a5899da7a Mon Sep 17 00:00:00 2001 From: Shijiang Wei Date: Fri, 30 Oct 2015 23:05:33 +0800 Subject: [PATCH] dont try to remove builtin networks in teardown Signed-off-by: Shijiang Wei Upstream-commit: 5970e94072b922b4c5e4ef12fb1b11391ba36d6b Component: engine --- .../engine/integration-cli/docker_utils.go | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/components/engine/integration-cli/docker_utils.go b/components/engine/integration-cli/docker_utils.go index 188c821f32..db28cafdf0 100644 --- a/components/engine/integration-cli/docker_utils.go +++ b/components/engine/integration-cli/docker_utils.go @@ -598,15 +598,16 @@ func deleteAllNetworks() error { } var errors []string for _, n := range networks { - if n.Name != "bridge" { - status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil) - if err != nil { - errors = append(errors, err.Error()) - continue - } - if status != http.StatusNoContent { - errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b))) - } + if n.Name == "bridge" || n.Name == "none" || n.Name == "host" { + continue + } + status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil) + if err != nil { + errors = append(errors, err.Error()) + continue + } + if status != http.StatusNoContent { + errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b))) } } if len(errors) > 0 {