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

Merge pull request #135 from mavenugo/epleave

Browse source 
Cleaning up the ActiveContainer test properly
This commit is contained in:
Jana Radhakrishnan 2015-05-08 22:37:01 -07:00
commit e745f03301
1 changed files with 60 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

81
libnetwork/libnetwork_test.go
View file

@ -606,10 +606,12 @@ func TestEndpointJoin(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
err = ep.Leave(containerID) defer func() {
if err != nil { err = ep.Leave(containerID)
t.Fatal(err) if err != nil {
} t.Fatal(err)
}
}()
} }
func TestEndpointJoinInvalidContainerId(t *testing.T) { func TestEndpointJoinInvalidContainerId(t *testing.T) {
@ -655,6 +657,17 @@ func TestEndpointDeleteWithActiveContainer(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
err = ep.Leave(containerID)
if err != nil {
t.Fatal(err)
}
err = ep.Delete()
if err != nil {
t.Fatal(err)
}
}()
err = ep.Delete() err = ep.Delete()
if err == nil { if err == nil {
@ -687,6 +700,12 @@ func TestEndpointMultipleJoins(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
err = ep.Leave(containerID)
if err != nil {
t.Fatal(err)
}
}()
_, err = ep.Join("container2") _, err = ep.Join("container2")
if err == nil { if err == nil {
@ -696,11 +715,6 @@ func TestEndpointMultipleJoins(t *testing.T) {
if err != libnetwork.ErrInvalidJoin { if err != libnetwork.ErrInvalidJoin {
t.Fatalf("Failed for unexpected reason: %v", err) t.Fatalf("Failed for unexpected reason: %v", err)
} }
err = ep.Leave(containerID)
if err != nil {
t.Fatal(err)
}
} }
func TestEndpointInvalidLeave(t *testing.T) { func TestEndpointInvalidLeave(t *testing.T) {
@ -733,6 +747,12 @@ func TestEndpointInvalidLeave(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
err = ep.Leave(containerID)
if err != nil {
t.Fatal(err)
}
}()
err = ep.Leave("") err = ep.Leave("")
if err == nil { if err == nil {
@ -752,10 +772,6 @@ func TestEndpointInvalidLeave(t *testing.T) {
t.Fatalf("Failed for unexpected reason: %v", err) t.Fatalf("Failed for unexpected reason: %v", err)
} }
err = ep.Leave(containerID)
if err != nil {
t.Fatal(err)
}
} }
func TestEndpointUpdateParent(t *testing.T) { func TestEndpointUpdateParent(t *testing.T) {
@ -779,6 +795,12 @@ func TestEndpointUpdateParent(t *testing.T) {
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }
defer func() {
err = ep1.Leave(containerID)
if err != nil {
t.Fatal(err)
}
}()
ep2, err := n.CreateEndpoint("ep2", nil) ep2, err := n.CreateEndpoint("ep2", nil)
if err != nil { if err != nil {
@ -795,15 +817,13 @@ func TestEndpointUpdateParent(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
err = ep2.Leave("container2") defer func() {
if err != nil { err = ep2.Leave("container2")
t.Fatal(err) if err != nil {
} t.Fatal(err)
}
}()
err = ep1.Leave(containerID)
if err != nil {
t.Fatal(err)
}
} }
func TestEnableIPv6(t *testing.T) { func TestEnableIPv6(t *testing.T) {
@ -845,6 +865,16 @@ func TestEnableIPv6(t *testing.T) {
_, err = ep1.Join(containerID, _, err = ep1.Join(containerID,
libnetwork.JoinOptionResolvConfPath(resolvConfPath)) libnetwork.JoinOptionResolvConfPath(resolvConfPath))
if err != nil {
t.Fatal(err)
}
defer func() {
err = ep1.Leave(containerID)
if err != nil {
t.Fatal(err)
}
}()
content, err := ioutil.ReadFile(resolvConfPath) content, err := ioutil.ReadFile(resolvConfPath)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
@ -894,6 +924,15 @@ func TestNoEnableIPv6(t *testing.T) {
_, err = ep1.Join(containerID, _, err = ep1.Join(containerID,
libnetwork.JoinOptionResolvConfPath(resolvConfPath)) libnetwork.JoinOptionResolvConfPath(resolvConfPath))
if err != nil {
t.Fatal(err)
}
defer func() {
err = ep1.Leave(containerID)
if err != nil {
t.Fatal(err)
}
}()
content, err := ioutil.ReadFile(resolvConfPath) content, err := ioutil.ReadFile(resolvConfPath)
if err != nil { if err != nil {