kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Make sure sandbox files are removed after tests

Browse source 
- and check for error on sandbox.Destroy() in tests

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-06-11 14:52:24 -07:00
parent d67a1b3908
commit b92d253d60
2 changed files with 33 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
libnetwork/sandbox/sandbox_test.go
View file

@ -65,7 +65,10 @@ func TestSandboxCreate(t *testing.T) {
verifySandbox(t, s, []string{"0", "1", "2"}) verifySandbox(t, s, []string{"0", "1", "2"})
runtime.LockOSThread() runtime.LockOSThread()
s.Destroy() err = s.Destroy()
if err != nil {
t.Fatal(err)
}
verifyCleanup(t, s, true) verifyCleanup(t, s, true)
} }
@ -90,7 +93,13 @@ func TestSandboxCreateTwice(t *testing.T) {
t.Fatalf("Failed to create a new sandbox: %v", err) t.Fatalf("Failed to create a new sandbox: %v", err)
} }
runtime.LockOSThread() runtime.LockOSThread()
s.Destroy()
err = s.Destroy()
if err != nil {
t.Fatal(err)
}
GC()
verifyCleanup(t, s, false)
} }
func TestSandboxGC(t *testing.T) { func TestSandboxGC(t *testing.T) {
@ -104,7 +113,10 @@ func TestSandboxGC(t *testing.T) {
t.Fatalf("Failed to create a new sandbox: %v", err) t.Fatalf("Failed to create a new sandbox: %v", err)
} }
s.Destroy() err = s.Destroy()
if err != nil {
t.Fatal(err)
}
GC() GC()
verifyCleanup(t, s, false) verifyCleanup(t, s, false)
@ -168,5 +180,11 @@ func TestAddRemoveInterface(t *testing.T) {
verifySandbox(t, s, []string{"1", "2", "3"}) verifySandbox(t, s, []string{"1", "2", "3"})
runtime.LockOSThread() runtime.LockOSThread()
s.Destroy() err = s.Destroy()
if err != nil {
t.Fatal(err)
}
GC()
verifyCleanup(t, s, false)
} }

12
libnetwork/sandboxdata_test.go
View file

@ -1,6 +1,10 @@
package libnetwork package libnetwork
import "testing" import (
"testing"
"github.com/docker/libnetwork/sandbox"
)
func createEmptyCtrlr() *controller { func createEmptyCtrlr() *controller {
return &controller{sandboxes: sandboxTable{}} return &controller{sandboxes: sandboxTable{}}
@ -31,6 +35,8 @@ func TestSandboxAddEmpty(t *testing.T) {
if len(ctrlr.sandboxes) != 0 { if len(ctrlr.sandboxes) != 0 {
t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes)) t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes))
} }
sandbox.GC()
} }
func TestSandboxAddMultiPrio(t *testing.T) { func TestSandboxAddMultiPrio(t *testing.T) {
@ -90,6 +96,8 @@ func TestSandboxAddMultiPrio(t *testing.T) {
if len(ctrlr.sandboxes) != 0 { if len(ctrlr.sandboxes) != 0 {
t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes)) t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes))
} }
sandbox.GC()
} }
func TestSandboxAddSamePrio(t *testing.T) { func TestSandboxAddSamePrio(t *testing.T) {
@ -127,4 +135,6 @@ func TestSandboxAddSamePrio(t *testing.T) {
if len(ctrlr.sandboxes) != 0 { if len(ctrlr.sandboxes) != 0 {
t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes)) t.Fatalf("controller sandboxes is not empty. len = %d", len(ctrlr.sandboxes))
} }
sandbox.GC()
} }