From bbcad73a273cc587c014366b61abc9ff0de1c54a Mon Sep 17 00:00:00 2001 From: Tibor Vass Date: Mon, 9 Sep 2019 21:05:58 +0000 Subject: [PATCH] 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 (cherry picked from commit 81d2a0c3898a7047dd12858223fda3aee6931eb0) Signed-off-by: Sebastiaan van Stijn --- integration-cli/check_test.go | 16 ++++++++-------- ...ocker_cli_external_volume_driver_unix_test.go | 2 +- integration-cli/docker_cli_network_unix_test.go | 2 +- integration-cli/docker_hub_pull_suite_test.go | 2 +- pkg/discovery/discovery_test.go | 2 +- pkg/discovery/file/file_test.go | 2 +- pkg/discovery/kv/kv_test.go | 2 +- pkg/discovery/memory/memory_test.go | 2 +- pkg/discovery/nodes/nodes_test.go | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/integration-cli/check_test.go b/integration-cli/check_test.go index f22298325f..ce0f845a24 100644 --- a/integration-cli/check_test.go +++ b/integration-cli/check_test.go @@ -77,7 +77,7 @@ func Test(t *testing.T) { } func init() { - check.Suite(&DockerSuite{}) + /*check.Suite(&DockerSuite{})*/ } type DockerSuite struct { @@ -109,7 +109,7 @@ func (s *DockerSuite) TearDownTest(c *testing.T) { } func init() { - check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})*/ } type DockerRegistrySuite struct { @@ -140,7 +140,7 @@ func (s *DockerRegistrySuite) TearDownTest(c *testing.T) { } func init() { - check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})*/ } type DockerSchema1RegistrySuite struct { @@ -171,7 +171,7 @@ func (s *DockerSchema1RegistrySuite) TearDownTest(c *testing.T) { } func init() { - check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})*/ } type DockerRegistryAuthHtpasswdSuite struct { @@ -204,7 +204,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *testing.T) { } func init() { - check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})*/ } type DockerRegistryAuthTokenSuite struct { @@ -243,7 +243,7 @@ func (s *DockerRegistryAuthTokenSuite) setupRegistryWithTokenService(c *testing. } func init() { - check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})*/ } type DockerDaemonSuite struct { @@ -286,7 +286,7 @@ func (s *DockerDaemonSuite) TearDownSuite(c *testing.T) { const defaultSwarmPort = 2477 func init() { - check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})*/ } type DockerSwarmSuite struct { @@ -348,7 +348,7 @@ func (s *DockerSwarmSuite) TearDownTest(c *testing.T) { } func init() { - check.Suite(&DockerPluginSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})*/ } type DockerPluginSuite struct { diff --git a/integration-cli/docker_cli_external_volume_driver_unix_test.go b/integration-cli/docker_cli_external_volume_driver_unix_test.go index effcd96c9f..b82bbd53cc 100644 --- a/integration-cli/docker_cli_external_volume_driver_unix_test.go +++ b/integration-cli/docker_cli_external_volume_driver_unix_test.go @@ -28,7 +28,7 @@ import ( const volumePluginName = "test-external-volume-driver" func init() { - check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})*/ } type eventCounter struct { diff --git a/integration-cli/docker_cli_network_unix_test.go b/integration-cli/docker_cli_network_unix_test.go index 5fa05f256f..808fac1272 100644 --- a/integration-cli/docker_cli_network_unix_test.go +++ b/integration-cli/docker_cli_network_unix_test.go @@ -39,7 +39,7 @@ const dummyIPAMDriver = "dummy-ipam-driver" var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest func init() { - check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}}) + /*check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})*/ } type DockerNetworkSuite struct { diff --git a/integration-cli/docker_hub_pull_suite_test.go b/integration-cli/docker_hub_pull_suite_test.go index 07175455d9..f1d229a887 100644 --- a/integration-cli/docker_hub_pull_suite_test.go +++ b/integration-cli/docker_hub_pull_suite_test.go @@ -15,7 +15,7 @@ func init() { // FIXME. Temporarily turning this off for Windows as GH16039 was breaking // Windows to Linux CI @icecrime if runtime.GOOS != "windows" { - check.Suite(newDockerHubPullSuite()) + /*check.Suite(newDockerHubPullSuite())*/ } } diff --git a/pkg/discovery/discovery_test.go b/pkg/discovery/discovery_test.go index aed2dd5181..e6a2b920ee 100644 --- a/pkg/discovery/discovery_test.go +++ b/pkg/discovery/discovery_test.go @@ -11,7 +11,7 @@ func Test(t *testing.T) { check.TestingT(t) } type DiscoverySuite struct{} -var _ = check.Suite(&DiscoverySuite{}) + /*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestNewEntry(c *testing.T) { entry, err := NewEntry("127.0.0.1:2375") diff --git a/pkg/discovery/file/file_test.go b/pkg/discovery/file/file_test.go index 3e3f38b24a..526f2b49ee 100644 --- a/pkg/discovery/file/file_test.go +++ b/pkg/discovery/file/file_test.go @@ -15,7 +15,7 @@ func Test(t *testing.T) { check.TestingT(t) } type DiscoverySuite struct{} -var _ = check.Suite(&DiscoverySuite{}) + /*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestInitialize(c *testing.T) { d := &Discovery{} diff --git a/pkg/discovery/kv/kv_test.go b/pkg/discovery/kv/kv_test.go index a80088852e..9270d3fb86 100644 --- a/pkg/discovery/kv/kv_test.go +++ b/pkg/discovery/kv/kv_test.go @@ -19,7 +19,7 @@ func Test(t *testing.T) { check.TestingT(t) } type DiscoverySuite struct{} -var _ = check.Suite(&DiscoverySuite{}) + /*check.Suite(&DiscoverySuite{})*/ func (ds *DiscoverySuite) TestInitialize(c *testing.T) { storeMock := &FakeStore{ diff --git a/pkg/discovery/memory/memory_test.go b/pkg/discovery/memory/memory_test.go index 16c017f2f6..4b112d9272 100644 --- a/pkg/discovery/memory/memory_test.go +++ b/pkg/discovery/memory/memory_test.go @@ -12,7 +12,7 @@ func Test(t *testing.T) { check.TestingT(t) } type discoverySuite struct{} -var _ = check.Suite(&discoverySuite{}) + /*check.Suite(&discoverySuite{})*/ func (s *discoverySuite) TestWatch(c *testing.T) { d := &Discovery{} diff --git a/pkg/discovery/nodes/nodes_test.go b/pkg/discovery/nodes/nodes_test.go index 8d7f28c135..eac4083801 100644 --- a/pkg/discovery/nodes/nodes_test.go +++ b/pkg/discovery/nodes/nodes_test.go @@ -13,7 +13,7 @@ func Test(t *testing.T) { check.TestingT(t) } type DiscoverySuite struct{} -var _ = check.Suite(&DiscoverySuite{}) + /*check.Suite(&DiscoverySuite{})*/ func (s *DiscoverySuite) TestInitialize(c *testing.T) { d := &Discovery{}