1. docker
  2. Commit 6a8a9738ec681b40af8f6018a1e0deff3d770713
Browse code

rm-gocheck: redress check.Suite calls

go run rm-gocheck.go redress '[^/]\bcheck\.Suite\(.*\{\s*$' \
"integration-cli/check_test.go" "integration-cli/docker_cli_external_volume_driver_unix_test.go" "integration-cli/docker_cli_network_unix_test.go"

Signed-off-by: Tibor Vass <tibor@docker.com>

Tibor Vass authored on 2019/09/10 06:05:58
Showing 3 changed files
integration-cli/check_test.go
History View file @ 6a8a973
... ... 
@@ -109,9 +109,7 @@ func (s *DockerSuite) TearDownTest(c *testing.T) {
109 109 
 }
110 110
111 111 
 func init() {
112 
-	check.Suite(&DockerRegistrySuite{
113 
-		ds: &DockerSuite{},
114 
-	})
112 
+	check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})
115 113 
 }
116 114
117 115 
 type DockerRegistrySuite struct {
... ... 
@@ -142,9 +140,7 @@ func (s *DockerRegistrySuite) TearDownTest(c *testing.T) {
142 142 
 }
143 143
144 144 
 func init() {
145 
-	check.Suite(&DockerSchema1RegistrySuite{
146 
-		ds: &DockerSuite{},
147 
-	})
145 
+	check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})
148 146 
 }
149 147
150 148 
 type DockerSchema1RegistrySuite struct {
... ... 
@@ -175,9 +171,7 @@ func (s *DockerSchema1RegistrySuite) TearDownTest(c *testing.T) {
175 175 
 }
176 176
177 177 
 func init() {
178 
-	check.Suite(&DockerRegistryAuthHtpasswdSuite{
179 
-		ds: &DockerSuite{},
180 
-	})
178 
+	check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})
181 179 
 }
182 180
183 181 
 type DockerRegistryAuthHtpasswdSuite struct {
... ... 
@@ -210,9 +204,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *testing.T) {
210 210 
 }
211 211
212 212 
 func init() {
213 
-	check.Suite(&DockerRegistryAuthTokenSuite{
214 
-		ds: &DockerSuite{},
215 
-	})
213 
+	check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})
216 214 
 }
217 215
218 216 
 type DockerRegistryAuthTokenSuite struct {
... ... 
@@ -251,9 +243,7 @@ func (s *DockerRegistryAuthTokenSuite) setupRegistryWithTokenService(c *testing.
251 251 
 }
252 252
253 253 
 func init() {
254 
-	check.Suite(&DockerDaemonSuite{
255 
-		ds: &DockerSuite{},
256 
-	})
254 
+	check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})
257 255 
 }
258 256
259 257 
 type DockerDaemonSuite struct {
... ... 
@@ -296,9 +286,7 @@ func (s *DockerDaemonSuite) TearDownSuite(c *testing.T) {
296 296 
 const defaultSwarmPort = 2477
297 297
298 298 
 func init() {
299 
-	check.Suite(&DockerSwarmSuite{
300 
-		ds: &DockerSuite{},
301 
-	})
299 
+	check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})
302 300 
 }
303 301
304 302 
 type DockerSwarmSuite struct {
... ... 
@@ -360,9 +348,7 @@ func (s *DockerSwarmSuite) TearDownTest(c *testing.T) {
360 360 
 }
361 361
362 362 
 func init() {
363 
-	check.Suite(&DockerPluginSuite{
364 
-		ds: &DockerSuite{},
365 
-	})
363 
+	check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})
366 364 
 }
367 365
368 366 
 type DockerPluginSuite struct {
integration-cli/docker_cli_external_volume_driver_unix_test.go
History View file @ 6a8a973
... ... 
@@ -28,9 +28,7 @@ import (
28 28 
 const volumePluginName = "test-external-volume-driver"
29 29
30 30 
 func init() {
31 
-	check.Suite(&DockerExternalVolumeSuite{
32 
-		ds: &DockerSuite{},
33 
-	})
31 
+	check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})
34 32 
 }
35 33
36 34 
 type eventCounter struct {
integration-cli/docker_cli_network_unix_test.go
History View file @ 6a8a973
... ... 
@@ -39,9 +39,7 @@ const dummyIPAMDriver = "dummy-ipam-driver"
39 39 
 var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest
40 40
41 41 
 func init() {
42 
-	check.Suite(&DockerNetworkSuite{
43 
-		ds: &DockerSuite{},
44 
-	})
42 
+	check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})
45 43 
 }
46 44
47 45 
 type DockerNetworkSuite struct {