0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Cleanup external sandbox from test

Browse source 
- otherwise "ValidKey" file is left behind

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-09-11 14:34:09 -07:00
parent 52bb21b7bd
commit 4104c0d0e5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
libnetwork/libnetwork_test.go
View file

@ -52,7 +52,6 @@ func TestMain(m *testing.M) {
err := controller.ConfigureNetworkDriver(bridgeNetType, genericOption) err := controller.ConfigureNetworkDriver(bridgeNetType, genericOption)
if err != nil { if err != nil {
//m.Fatal(err)
os.Exit(1) os.Exit(1)
} }
@ -1243,6 +1242,7 @@ func TestExternalKey(t *testing.T) {
if err := cnt.Delete(); err != nil { if err := cnt.Delete(); err != nil {
t.Fatal(err) t.Fatal(err)
} }
osl.GC()
}() }()
// Join endpoint to sandbox before SetKey // Join endpoint to sandbox before SetKey
@ -1270,8 +1270,14 @@ func TestExternalKey(t *testing.T) {
} }
// Create a new OS sandbox using the osl API before using it in SetKey // Create a new OS sandbox using the osl API before using it in SetKey
if _, err := osl.NewSandbox("ValidKey", true); err != nil { if extOsBox, err := osl.NewSandbox("ValidKey", true); err != nil {
t.Fatalf("Failed to create new osl sandbox") t.Fatalf("Failed to create new osl sandbox")
} else {
defer func() {
if err := extOsBox.Destroy(); err != nil {
log.Warnf("Failed to remove os sandbox: %v", err)
}
}()
} }
if err := sbox.SetKey("ValidKey"); err != nil { if err := sbox.SetKey("ValidKey"); err != nil {