Merge pull request #177 from mrjana/cnm_integ

Cleanup namespace files

sandbox/namespace_linux.go

@@ -91,10 +91,19 @@ func createNetworkNamespace(path string, osCreate bool) (*Info, error) {
 	return info, nil
 }
 
+func cleanupNamespaceFile(path string) {
+	if _, err := os.Stat(path); err == nil {
+		n := &networkNamespace{path: path}
+		n.Destroy()
+	}
+}
+
 func createNamespaceFile(path string) (err error) {
 	var f *os.File
 
 	once.Do(createBasePath)
+	// cleanup namespace file if it already exists because of a previous ungraceful exit.
+	cleanupNamespaceFile(path)
 	if f, err = os.Create(path); err == nil {
 		f.Close()
 	}

sandbox/sandbox_test.go

@@ -46,6 +46,26 @@ func TestSandboxCreate(t *testing.T) {
 	s.Destroy()
 }
 
+func TestSandboxCreateTwice(t *testing.T) {
+	key, err := newKey(t)
+	if err != nil {
+		t.Fatalf("Failed to obtain a key: %v", err)
+	}
+
+	_, err = NewSandbox(key, true)
+	if err != nil {
+		t.Fatalf("Failed to create a new sandbox: %v", err)
+	}
+
+	// Create another sandbox with the same key to see if we handle it
+	// gracefully.
+	s, err := NewSandbox(key, true)
+	if err != nil {
+		t.Fatalf("Failed to create a new sandbox: %v", err)
+	}
+	s.Destroy()
+}
+
 func TestInterfaceEqual(t *testing.T) {
 	list := getInterfaceList()