Browse code

Remove race and split TestAPINetworkInspect test

Signed-off-by: Christopher Crone <christopher.crone@docker.com>

Christopher Crone authored on 2017/09/13 00:18:02
Showing 1 changed files
... ...
@@ -76,12 +76,11 @@ func (s *DockerSuite) TestAPINetworkFilter(c *check.C) {
76 76
 	c.Assert(nr.Name, checker.Equals, "bridge")
77 77
 }
78 78
 
79
-func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {
79
+func (s *DockerSuite) TestAPINetworkInspectBridge(c *check.C) {
80 80
 	testRequires(c, DaemonIsLinux)
81 81
 	// Inspect default bridge network
82 82
 	nr := getNetworkResource(c, "bridge")
83 83
 	c.Assert(nr.Name, checker.Equals, "bridge")
84
-	connCount := len(nr.Containers)
85 84
 
86 85
 	// run a container and attach it to the default bridge network
87 86
 	out, _ := dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
... ...
@@ -95,13 +94,15 @@ func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {
95 95
 	c.Assert(nr.Internal, checker.Equals, false)
96 96
 	c.Assert(nr.EnableIPv6, checker.Equals, false)
97 97
 	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
98
-	c.Assert(len(nr.Containers), checker.Equals, connCount+1)
99 98
 	c.Assert(nr.Containers[containerID], checker.NotNil)
100 99
 
101 100
 	ip, _, err := net.ParseCIDR(nr.Containers[containerID].IPv4Address)
102 101
 	c.Assert(err, checker.IsNil)
103 102
 	c.Assert(ip.String(), checker.Equals, containerIP)
103
+}
104 104
 
105
+func (s *DockerSuite) TestAPINetworkInspectUserDefinedNetwork(c *check.C) {
106
+	testRequires(c, DaemonIsLinux)
105 107
 	// IPAM configuration inspect
106 108
 	ipam := &network.IPAM{
107 109
 		Driver: "default",
... ...
@@ -118,7 +119,7 @@ func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {
118 118
 	id0 := createNetwork(c, config, true)
119 119
 	c.Assert(isNetworkAvailable(c, "br0"), checker.Equals, true)
120 120
 
121
-	nr = getNetworkResource(c, id0)
121
+	nr := getNetworkResource(c, id0)
122 122
 	c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
123 123
 	c.Assert(nr.IPAM.Config[0].Subnet, checker.Equals, "172.28.0.0/16")
124 124
 	c.Assert(nr.IPAM.Config[0].IPRange, checker.Equals, "172.28.5.0/24")