Merge pull request #50 from slankdev/slankdev-fix-down

internal/pkg/shell: fix down behavior
tinynetwork · Jul 26, 2020 · 525a74d · 525a74d
2 parents 62116c1 + 014f844
commit 525a74d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/internal/pkg/shell/shell.go b/internal/pkg/shell/shell.go
@@ -139,7 +139,7 @@ func (node *Node) DeleteNode() (deleteNodeCmds []string) {
 	var deleteCmd string
 
 	if node.Type == "docker" || node.Type == "" {
-		deleteCmd = fmt.Sprintf("docker rm -f %s", node.Name)
+		deleteCmd = fmt.Sprintf("docker rm -f %s || true", node.Name)
 	} else if node.Type == "netns" {
 		deleteCmd = fmt.Sprintf("ip netns del %s", node.Name)
 	} else {

diff --git a/internal/pkg/shell/shell_test.go b/internal/pkg/shell/shell_test.go
@@ -121,7 +121,7 @@ func TestNode_DeleteNode(t *testing.T) {
 					},
 				},
 			},
-			want: []string{"docker rm -f R1", "rm -rf /var/run/netns/R1"},
+			want: []string{"docker rm -f R1 || true", "rm -rf /var/run/netns/R1"},
 		},
 		{
 			name: "delete netns",
-Original file line number
+Diff line change
@@ Expand Up / @@ -121,7 +121,7 @@ func TestNode_DeleteNode(t *testing.T) { @@
     					},
     				},
     			},
-    			want: []string{"docker rm -f R1", "rm -rf /var/run/netns/R1"},
+    			want: []string{"docker rm -f R1 || true", "rm -rf /var/run/netns/R1"},
     		},
     		{
     			name: "delete netns",
@@ Expand Down @@