Browse code
rm-gocheck: comment out check.Suite calls
sed -E -i 's#^([^*])+?((var .*)?check\.Suite\(.*\))#\1/*\2*/#g' \
-- "integration-cli/check_test.go" "integration-cli/docker_cli_external_volume_driver_unix_test.go" "integration-cli/docker_cli_network_unix_test.go" "integration-cli/docker_hub_pull_suite_test.go" "pkg/discovery/discovery_test.go" "pkg/discovery/file/file_test.go" "pkg/discovery/kv/kv_test.go" "pkg/discovery/memory/memory_test.go" "pkg/discovery/nodes/nodes_test.go"
Signed-off-by: Tibor Vass <tibor@docker.com>
(cherry picked from commit 81d2a0c3898a7047dd12858223fda3aee6931eb0)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Tibor Vass authored on 2019/09/10 06:05:58Showing 9 changed files
- integration-cli/check_test.go
- integration-cli/docker_cli_external_volume_driver_unix_test.go
- integration-cli/docker_cli_network_unix_test.go
- integration-cli/docker_hub_pull_suite_test.go
- pkg/discovery/discovery_test.go
- pkg/discovery/file/file_test.go
- pkg/discovery/kv/kv_test.go
- pkg/discovery/memory/memory_test.go
- pkg/discovery/nodes/nodes_test.go
| ... | ... |
@@ -77,7 +77,7 @@ func Test(t *testing.T) {
|
| 77 | 77 |
} |
| 78 | 78 |
|
| 79 | 79 |
func init() {
|
| 80 |
- check.Suite(&DockerSuite{})
|
|
| 80 |
+ /*check.Suite(&DockerSuite{})*/
|
|
| 81 | 81 |
} |
| 82 | 82 |
|
| 83 | 83 |
type DockerSuite struct {
|
| ... | ... |
@@ -109,7 +109,7 @@ func (s *DockerSuite) TearDownTest(c *testing.T) {
|
| 109 | 109 |
} |
| 110 | 110 |
|
| 111 | 111 |
func init() {
|
| 112 |
- check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})
|
|
| 112 |
+ /*check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})*/
|
|
| 113 | 113 |
} |
| 114 | 114 |
|
| 115 | 115 |
type DockerRegistrySuite struct {
|
| ... | ... |
@@ -140,7 +140,7 @@ func (s *DockerRegistrySuite) TearDownTest(c *testing.T) {
|
| 140 | 140 |
} |
| 141 | 141 |
|
| 142 | 142 |
func init() {
|
| 143 |
- check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})
|
|
| 143 |
+ /*check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})*/
|
|
| 144 | 144 |
} |
| 145 | 145 |
|
| 146 | 146 |
type DockerSchema1RegistrySuite struct {
|
| ... | ... |
@@ -171,7 +171,7 @@ func (s *DockerSchema1RegistrySuite) TearDownTest(c *testing.T) {
|
| 171 | 171 |
} |
| 172 | 172 |
|
| 173 | 173 |
func init() {
|
| 174 |
- check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})
|
|
| 174 |
+ /*check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})*/
|
|
| 175 | 175 |
} |
| 176 | 176 |
|
| 177 | 177 |
type DockerRegistryAuthHtpasswdSuite struct {
|
| ... | ... |
@@ -204,7 +204,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *testing.T) {
|
| 204 | 204 |
} |
| 205 | 205 |
|
| 206 | 206 |
func init() {
|
| 207 |
- check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})
|
|
| 207 |
+ /*check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})*/
|
|
| 208 | 208 |
} |
| 209 | 209 |
|
| 210 | 210 |
type DockerRegistryAuthTokenSuite struct {
|
| ... | ... |
@@ -243,7 +243,7 @@ func (s *DockerRegistryAuthTokenSuite) setupRegistryWithTokenService(c *testing. |
| 243 | 243 |
} |
| 244 | 244 |
|
| 245 | 245 |
func init() {
|
| 246 |
- check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})
|
|
| 246 |
+ /*check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})*/
|
|
| 247 | 247 |
} |
| 248 | 248 |
|
| 249 | 249 |
type DockerDaemonSuite struct {
|
| ... | ... |
@@ -286,7 +286,7 @@ func (s *DockerDaemonSuite) TearDownSuite(c *testing.T) {
|
| 286 | 286 |
const defaultSwarmPort = 2477 |
| 287 | 287 |
|
| 288 | 288 |
func init() {
|
| 289 |
- check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})
|
|
| 289 |
+ /*check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})*/
|
|
| 290 | 290 |
} |
| 291 | 291 |
|
| 292 | 292 |
type DockerSwarmSuite struct {
|
| ... | ... |
@@ -348,7 +348,7 @@ func (s *DockerSwarmSuite) TearDownTest(c *testing.T) {
|
| 348 | 348 |
} |
| 349 | 349 |
|
| 350 | 350 |
func init() {
|
| 351 |
- check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})
|
|
| 351 |
+ /*check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})*/
|
|
| 352 | 352 |
} |
| 353 | 353 |
|
| 354 | 354 |
type DockerPluginSuite struct {
|
| ... | ... |
@@ -28,7 +28,7 @@ import ( |
| 28 | 28 |
const volumePluginName = "test-external-volume-driver" |
| 29 | 29 |
|
| 30 | 30 |
func init() {
|
| 31 |
- check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})
|
|
| 31 |
+ /*check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})*/
|
|
| 32 | 32 |
} |
| 33 | 33 |
|
| 34 | 34 |
type eventCounter struct {
|
| ... | ... |
@@ -39,7 +39,7 @@ const dummyIPAMDriver = "dummy-ipam-driver" |
| 39 | 39 |
var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest |
| 40 | 40 |
|
| 41 | 41 |
func init() {
|
| 42 |
- check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})
|
|
| 42 |
+ /*check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})*/
|
|
| 43 | 43 |
} |
| 44 | 44 |
|
| 45 | 45 |
type DockerNetworkSuite struct {
|
| ... | ... |
@@ -15,7 +15,7 @@ func init() {
|
| 15 | 15 |
// FIXME. Temporarily turning this off for Windows as GH16039 was breaking |
| 16 | 16 |
// Windows to Linux CI @icecrime |
| 17 | 17 |
if runtime.GOOS != "windows" {
|
| 18 |
- check.Suite(newDockerHubPullSuite()) |
|
| 18 |
+ /*check.Suite(newDockerHubPullSuite())*/ |
|
| 19 | 19 |
} |
| 20 | 20 |
} |
| 21 | 21 |
|
| ... | ... |
@@ -11,7 +11,7 @@ func Test(t *testing.T) { check.TestingT(t) }
|
| 11 | 11 |
|
| 12 | 12 |
type DiscoverySuite struct{}
|
| 13 | 13 |
|
| 14 |
-var _ = check.Suite(&DiscoverySuite{})
|
|
| 14 |
+ /*check.Suite(&DiscoverySuite{})*/
|
|
| 15 | 15 |
|
| 16 | 16 |
func (s *DiscoverySuite) TestNewEntry(c *testing.T) {
|
| 17 | 17 |
entry, err := NewEntry("127.0.0.1:2375")
|
| ... | ... |
@@ -19,7 +19,7 @@ func Test(t *testing.T) { check.TestingT(t) }
|
| 19 | 19 |
|
| 20 | 20 |
type DiscoverySuite struct{}
|
| 21 | 21 |
|
| 22 |
-var _ = check.Suite(&DiscoverySuite{})
|
|
| 22 |
+ /*check.Suite(&DiscoverySuite{})*/
|
|
| 23 | 23 |
|
| 24 | 24 |
func (ds *DiscoverySuite) TestInitialize(c *testing.T) {
|
| 25 | 25 |
storeMock := &FakeStore{
|