jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #314 from crosbymichael/use-ns-ptr 

Namespaces methods should act on pointer
This commit is contained in:
Alexander Morozov 2014-12-23 19:18:50 -08:00
parent 10d49f830b afb167a417
commit 0f397d4e14
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
config.go
View File

@ -30,26 +30,26 @@ type Namespace struct {
type Namespaces []Namespace type Namespaces []Namespace
func (n Namespaces) Remove(t NamespaceType) bool { func (n *Namespaces) Remove(t NamespaceType) bool {
i := n.index(t) i := n.index(t)
if i == -1 { if i == -1 {
return false return false
} }
n = append(n[:i], n[i+1:]...) *n = append((*n)[:i], (*n)[i+1:]...)
return true return true
} }
func (n Namespaces) Add(t NamespaceType, path string) { func (n *Namespaces) Add(t NamespaceType, path string) {
i := n.index(t) i := n.index(t)
if i == -1 { if i == -1 {
n = append(n, Namespace{Type: t, Path: path}) *n = append(*n, Namespace{Type: t, Path: path})
return return
} }
n[i].Path = path (*n)[i].Path = path
} }
func (n Namespaces) index(t NamespaceType) int { func (n *Namespaces) index(t NamespaceType) int {
for i, ns := range n { for i, ns := range *n {
if ns.Type == t { if ns.Type == t {
return i return i
} }
@ -57,7 +57,7 @@ func (n Namespaces) index(t NamespaceType) int {
return -1 return -1
} }
func (n Namespaces) Contains(t NamespaceType) bool { func (n *Namespaces) Contains(t NamespaceType) bool {
return n.index(t) != -1 return n.index(t) != -1
} }

12
config_test.go
View File

@ -158,3 +158,15 @@ func TestSelinuxLabels(t *testing.T) {
t.Fatalf("expected mount label %q but received %q", label, container.MountConfig.MountLabel) t.Fatalf("expected mount label %q but received %q", label, container.MountConfig.MountLabel)
} }
} }
func TestRemoveNamespace(t *testing.T) {
ns := Namespaces{
{Type: NEWNET},
}
if !ns.Remove(NEWNET) {
t.Fatal("NEWNET was not removed")
}
if len(ns) != 0 {
t.Fatalf("namespaces should have 0 items but reports %d", len(ns))
}
}