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 81d2a0c389)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Tibor Vass 2019-09-09 21:05:58 +00:00 committed by Sebastiaan van Stijn
parent 1da0c05e48
commit bbcad73a27
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
9 changed files with 16 additions and 16 deletions

View File

@ -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 {

View File

@ -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 {

View File

@ -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 {

View File

@ -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())*/
}
}

View File

@ -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")

View File

@ -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{}

View File

@ -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{

View File

@ -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{}

View File

@ -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{}