Bladeren bron

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>
Tibor Vass 5 jaren geleden
bovenliggende
commit
81d2a0c389

+ 8 - 8
integration-cli/check_test.go

@@ -77,7 +77,7 @@ func Test(t *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerSuite{})
+	/*check.Suite(&DockerSuite{})*/
 }
 }
 
 
 type DockerSuite struct {
 type DockerSuite struct {
@@ -109,7 +109,7 @@ func (s *DockerSuite) TearDownTest(c *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerRegistrySuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerRegistrySuite struct {
 type DockerRegistrySuite struct {
@@ -140,7 +140,7 @@ func (s *DockerRegistrySuite) TearDownTest(c *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerSchema1RegistrySuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerSchema1RegistrySuite struct {
 type DockerSchema1RegistrySuite struct {
@@ -171,7 +171,7 @@ func (s *DockerSchema1RegistrySuite) TearDownTest(c *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerRegistryAuthHtpasswdSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerRegistryAuthHtpasswdSuite struct {
 type DockerRegistryAuthHtpasswdSuite struct {
@@ -204,7 +204,7 @@ func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerRegistryAuthTokenSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerRegistryAuthTokenSuite struct {
 type DockerRegistryAuthTokenSuite struct {
@@ -243,7 +243,7 @@ func (s *DockerRegistryAuthTokenSuite) setupRegistryWithTokenService(c *testing.
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerDaemonSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerDaemonSuite struct {
 type DockerDaemonSuite struct {
@@ -286,7 +286,7 @@ func (s *DockerDaemonSuite) TearDownSuite(c *testing.T) {
 const defaultSwarmPort = 2477
 const defaultSwarmPort = 2477
 
 
 func init() {
 func init() {
-	check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerSwarmSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerSwarmSuite struct {
 type DockerSwarmSuite struct {
@@ -348,7 +348,7 @@ func (s *DockerSwarmSuite) TearDownTest(c *testing.T) {
 }
 }
 
 
 func init() {
 func init() {
-	check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerPluginSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerPluginSuite struct {
 type DockerPluginSuite struct {

+ 1 - 1
integration-cli/docker_cli_external_volume_driver_unix_test.go

@@ -28,7 +28,7 @@ import (
 const volumePluginName = "test-external-volume-driver"
 const volumePluginName = "test-external-volume-driver"
 
 
 func init() {
 func init() {
-	check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerExternalVolumeSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type eventCounter struct {
 type eventCounter struct {

+ 1 - 1
integration-cli/docker_cli_network_unix_test.go

@@ -39,7 +39,7 @@ const dummyIPAMDriver = "dummy-ipam-driver"
 var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest
 var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest
 
 
 func init() {
 func init() {
-	check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})
+	/*check.Suite(&DockerNetworkSuite{ds: &DockerSuite{}})*/
 }
 }
 
 
 type DockerNetworkSuite struct {
 type DockerNetworkSuite struct {

+ 1 - 1
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
 	// FIXME. Temporarily turning this off for Windows as GH16039 was breaking
 	// Windows to Linux CI @icecrime
 	// Windows to Linux CI @icecrime
 	if runtime.GOOS != "windows" {
 	if runtime.GOOS != "windows" {
-		check.Suite(newDockerHubPullSuite())
+	/*check.Suite(newDockerHubPullSuite())*/
 	}
 	}
 }
 }
 
 

+ 1 - 1
pkg/discovery/discovery_test.go

@@ -11,7 +11,7 @@ func Test(t *testing.T) { check.TestingT(t) }
 
 
 type DiscoverySuite struct{}
 type DiscoverySuite struct{}
 
 
-var _ = check.Suite(&DiscoverySuite{})
+ /*check.Suite(&DiscoverySuite{})*/
 
 
 func (s *DiscoverySuite) TestNewEntry(c *testing.T) {
 func (s *DiscoverySuite) TestNewEntry(c *testing.T) {
 	entry, err := NewEntry("127.0.0.1:2375")
 	entry, err := NewEntry("127.0.0.1:2375")

+ 1 - 1
pkg/discovery/file/file_test.go

@@ -15,7 +15,7 @@ func Test(t *testing.T) { check.TestingT(t) }
 
 
 type DiscoverySuite struct{}
 type DiscoverySuite struct{}
 
 
-var _ = check.Suite(&DiscoverySuite{})
+ /*check.Suite(&DiscoverySuite{})*/
 
 
 func (s *DiscoverySuite) TestInitialize(c *testing.T) {
 func (s *DiscoverySuite) TestInitialize(c *testing.T) {
 	d := &Discovery{}
 	d := &Discovery{}

+ 1 - 1
pkg/discovery/kv/kv_test.go

@@ -19,7 +19,7 @@ func Test(t *testing.T) { check.TestingT(t) }
 
 
 type DiscoverySuite struct{}
 type DiscoverySuite struct{}
 
 
-var _ = check.Suite(&DiscoverySuite{})
+ /*check.Suite(&DiscoverySuite{})*/
 
 
 func (ds *DiscoverySuite) TestInitialize(c *testing.T) {
 func (ds *DiscoverySuite) TestInitialize(c *testing.T) {
 	storeMock := &FakeStore{
 	storeMock := &FakeStore{

+ 1 - 1
pkg/discovery/memory/memory_test.go

@@ -12,7 +12,7 @@ func Test(t *testing.T) { check.TestingT(t) }
 
 
 type discoverySuite struct{}
 type discoverySuite struct{}
 
 
-var _ = check.Suite(&discoverySuite{})
+ /*check.Suite(&discoverySuite{})*/
 
 
 func (s *discoverySuite) TestWatch(c *testing.T) {
 func (s *discoverySuite) TestWatch(c *testing.T) {
 	d := &Discovery{}
 	d := &Discovery{}

+ 1 - 1
pkg/discovery/nodes/nodes_test.go

@@ -13,7 +13,7 @@ func Test(t *testing.T) { check.TestingT(t) }
 
 
 type DiscoverySuite struct{}
 type DiscoverySuite struct{}
 
 
-var _ = check.Suite(&DiscoverySuite{})
+ /*check.Suite(&DiscoverySuite{})*/
 
 
 func (s *DiscoverySuite) TestInitialize(c *testing.T) {
 func (s *DiscoverySuite) TestInitialize(c *testing.T) {
 	d := &Discovery{}
 	d := &Discovery{}