internal: move leakcheck to internal/ (#2129)

internal: move leakcheck to internal/
grpc · Jun 7, 2018 · 0e5a36b · 0e5a36b
1 parent 26ac8d2
commit 0e5a36b
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 15 deletions.
diff --git a/balancer/grpclb/grpclb_test.go b/balancer/grpclb/grpclb_test.go
@@ -38,13 +38,13 @@ import (
  lbmpb "google.golang.org/grpc/grpclb/grpc_lb_v1/messages"
  lbspb "google.golang.org/grpc/grpclb/grpc_lb_v1/service"
  _ "google.golang.org/grpc/grpclog/glogger"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/metadata"
  "google.golang.org/grpc/peer"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
  "google.golang.org/grpc/status"
  testpb "google.golang.org/grpc/test/grpc_testing"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 var (

diff --git a/balancer/roundrobin/roundrobin_test.go b/balancer/roundrobin/roundrobin_test.go
@@ -30,12 +30,12 @@ import (
  "google.golang.org/grpc/balancer/roundrobin"
  "google.golang.org/grpc/codes"
  _ "google.golang.org/grpc/grpclog/glogger"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/peer"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
  "google.golang.org/grpc/status"
  testpb "google.golang.org/grpc/test/grpc_testing"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 type testServer struct {

diff --git a/balancer_switching_test.go b/balancer_switching_test.go
@@ -29,9 +29,9 @@ import (
  "google.golang.org/grpc/balancer/roundrobin"
  "google.golang.org/grpc/connectivity"
  _ "google.golang.org/grpc/grpclog/glogger"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 var _ balancer.Builder = &magicalLB{}

diff --git a/balancer_test.go b/balancer_test.go
@@ -29,9 +29,9 @@ import (
  "golang.org/x/net/context"
  "google.golang.org/grpc/codes"
  _ "google.golang.org/grpc/grpclog/glogger"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/naming"
  "google.golang.org/grpc/status"
- "google.golang.org/grpc/test/leakcheck"
 
  // V1 balancer tests use passthrough resolver instead of dns.
  // TODO(bar) remove this when removing v1 balaner entirely.

diff --git a/call_test.go b/call_test.go
@@ -31,8 +31,8 @@ import (
 
  "golang.org/x/net/context"
  "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/status"
- "google.golang.org/grpc/test/leakcheck"
  "google.golang.org/grpc/transport"
 )
 

diff --git a/clientconn_test.go b/clientconn_test.go
@@ -30,12 +30,12 @@ import (
 
  "google.golang.org/grpc/connectivity"
  "google.golang.org/grpc/credentials"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/keepalive"
  "google.golang.org/grpc/naming"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
  _ "google.golang.org/grpc/resolver/passthrough"
- "google.golang.org/grpc/test/leakcheck"
  "google.golang.org/grpc/testdata"
 )
 

diff --git a/test/leakcheck/leakcheck.go → internal/leakcheck/leakcheck.go b/test/leakcheck/leakcheck.go → internal/leakcheck/leakcheck.go
diff --git a/test/leakcheck/leakcheck_test.go → internal/leakcheck/leakcheck_test.go b/test/leakcheck/leakcheck_test.go → internal/leakcheck/leakcheck_test.go
diff --git a/picker_wrapper_test.go b/picker_wrapper_test.go
@@ -28,7 +28,7 @@ import (
  "google.golang.org/grpc/balancer"
  "google.golang.org/grpc/connectivity"
  _ "google.golang.org/grpc/grpclog/glogger"
- "google.golang.org/grpc/test/leakcheck"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/transport"
 )
 

diff --git a/pickfirst_test.go b/pickfirst_test.go
@@ -26,10 +26,10 @@ import (
 
  "golang.org/x/net/context"
  "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
  "google.golang.org/grpc/status"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 func errorDesc(err error) string {

diff --git a/proxy_test.go b/proxy_test.go
@@ -30,7 +30,7 @@ import (
  "time"
 
  "golang.org/x/net/context"
- "google.golang.org/grpc/test/leakcheck"
+ "google.golang.org/grpc/internal/leakcheck"
 )
 
 const (

diff --git a/resolver/dns/dns_resolver_test.go b/resolver/dns/dns_resolver_test.go
@@ -27,8 +27,8 @@ import (
  "testing"
  "time"
 
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/resolver"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 func TestMain(m *testing.M) {

diff --git a/server_test.go b/server_test.go
@@ -26,7 +26,7 @@ import (
  "time"
 
  "golang.org/x/net/context"
- "google.golang.org/grpc/test/leakcheck"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/transport"
 )
 

diff --git a/stickiness_test.go b/stickiness_test.go
@@ -27,10 +27,10 @@ import (
 
  "golang.org/x/net/context"
  "google.golang.org/grpc/balancer/roundrobin"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/metadata"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 func TestStickyKeyFromContext(t *testing.T) {

diff --git a/test/channelz_test.go b/test/channelz_test.go
@@ -31,12 +31,12 @@ import (
  _ "google.golang.org/grpc/balancer/grpclb"
  "google.golang.org/grpc/channelz"
  "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/keepalive"
  "google.golang.org/grpc/resolver"
  "google.golang.org/grpc/resolver/manual"
  "google.golang.org/grpc/status"
  testpb "google.golang.org/grpc/test/grpc_testing"
- "google.golang.org/grpc/test/leakcheck"
 )
 
 func init() {

diff --git a/test/end2end_test.go b/test/end2end_test.go
@@ -56,6 +56,7 @@ import (
  healthgrpc "google.golang.org/grpc/health/grpc_health_v1"
  healthpb "google.golang.org/grpc/health/grpc_health_v1"
  "google.golang.org/grpc/internal"
+ "google.golang.org/grpc/internal/leakcheck"
  "google.golang.org/grpc/keepalive"
  "google.golang.org/grpc/metadata"
  "google.golang.org/grpc/peer"
@@ -66,7 +67,6 @@ import (
  "google.golang.org/grpc/status"
  "google.golang.org/grpc/tap"
  testpb "google.golang.org/grpc/test/grpc_testing"
- "google.golang.org/grpc/test/leakcheck"
  "google.golang.org/grpc/testdata"
 )
 

diff --git a/test/gracefulstop_test.go b/test/gracefulstop_test.go
@@ -28,7 +28,7 @@ import (
 
  "golang.org/x/net/context"
  "google.golang.org/grpc"
- "google.golang.org/grpc/test/leakcheck"
+ "google.golang.org/grpc/internal/leakcheck"
 
  testpb "google.golang.org/grpc/test/grpc_testing"
 )