Skip to content

Commit ca9e0c3

Browse files
thinkeroumenghanl
authored andcommitted
Add testdata package and unify testdata to only one dir (grpc#1297)
1 parent a568439 commit ca9e0c3

File tree

33 files changed

+91
-410
lines changed

33 files changed

+91
-410
lines changed

benchmark/server/testdata/ca.pem

Lines changed: 0 additions & 15 deletions
This file was deleted.

benchmark/server/testdata/server1.key

Lines changed: 0 additions & 16 deletions
This file was deleted.

benchmark/server/testdata/server1.pem

Lines changed: 0 additions & 16 deletions
This file was deleted.

benchmark/worker/benchmark_client.go

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,7 @@ import (
3333
"google.golang.org/grpc/codes"
3434
"google.golang.org/grpc/credentials"
3535
"google.golang.org/grpc/grpclog"
36-
)
37-
38-
var (
39-
caFile = "benchmark/server/testdata/ca.pem"
36+
"google.golang.org/grpc/testdata"
4037
)
4138

4239
type lockingHistogram struct {
@@ -122,7 +119,7 @@ func createConns(config *testpb.ClientConfig) ([]*grpc.ClientConn, func(), error
122119

123120
// Check and set security options.
124121
if config.SecurityParams != nil {
125-
creds, err := credentials.NewClientTLSFromFile(abs(caFile), config.SecurityParams.ServerHostOverride)
122+
creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), config.SecurityParams.ServerHostOverride)
126123
if err != nil {
127124
return nil, nil, grpc.Errorf(codes.InvalidArgument, "failed to create TLS credentials %v", err)
128125
}

benchmark/worker/benchmark_server.go

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,7 @@ import (
3232
"google.golang.org/grpc/codes"
3333
"google.golang.org/grpc/credentials"
3434
"google.golang.org/grpc/grpclog"
35-
)
36-
37-
var (
38-
// File path related to google.golang.org/grpc.
39-
certFile = "benchmark/server/testdata/server1.pem"
40-
keyFile = "benchmark/server/testdata/server1.key"
35+
"google.golang.org/grpc/testdata"
4136
)
4237

4338
type benchmarkServer struct {
@@ -90,7 +85,7 @@ func startBenchmarkServer(config *testpb.ServerConfig, serverPort int) (*benchma
9085

9186
// Set security options.
9287
if config.SecurityParams != nil {
93-
creds, err := credentials.NewServerTLSFromFile(abs(certFile), abs(keyFile))
88+
creds, err := credentials.NewServerTLSFromFile(testdata.Path("server1.pem"), testdata.Path("server1.key"))
9489
if err != nil {
9590
grpclog.Fatalf("failed to generate credentials %v", err)
9691
}

benchmark/worker/util.go

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -18,26 +18,7 @@
1818

1919
package main
2020

21-
import (
22-
"log"
23-
"os"
24-
"path/filepath"
25-
"syscall"
26-
)
27-
28-
// abs returns the absolute path the given relative file or directory path,
29-
// relative to the google.golang.org/grpc directory in the user's GOPATH.
30-
// If rel is already absolute, it is returned unmodified.
31-
func abs(rel string) string {
32-
if filepath.IsAbs(rel) {
33-
return rel
34-
}
35-
v, err := goPackagePath("google.golang.org/grpc")
36-
if err != nil {
37-
log.Fatalf("Error finding google.golang.org/grpc/testdata directory: %v", err)
38-
}
39-
return filepath.Join(v, rel)
40-
}
21+
import "syscall"
4122

4223
func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float64) {
4324
var (
@@ -52,25 +33,3 @@ func cpuTimeDiff(first *syscall.Rusage, latest *syscall.Rusage) (float64, float6
5233

5334
return uTimeElapsed, sTimeElapsed
5435
}
55-
56-
func goPackagePath(pkg string) (path string, err error) {
57-
gp := os.Getenv("GOPATH")
58-
if gp == "" {
59-
return path, os.ErrNotExist
60-
}
61-
for _, p := range filepath.SplitList(gp) {
62-
dir := filepath.Join(p, "src", filepath.FromSlash(pkg))
63-
fi, err := os.Stat(dir)
64-
if os.IsNotExist(err) {
65-
continue
66-
}
67-
if err != nil {
68-
return "", err
69-
}
70-
if !fi.IsDir() {
71-
continue
72-
}
73-
return dir, nil
74-
}
75-
return path, os.ErrNotExist
76-
}

clientconn_test.go

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ import (
2929
"google.golang.org/grpc/credentials"
3030
"google.golang.org/grpc/keepalive"
3131
"google.golang.org/grpc/naming"
32+
"google.golang.org/grpc/testdata"
3233
)
3334

34-
const tlsDir = "testdata/"
35-
3635
func assertState(wantState ConnectivityState, cc *ClientConn) (ConnectivityState, bool) {
3736
ctx, _ := context.WithTimeout(context.Background(), time.Second)
3837
var state ConnectivityState
@@ -93,7 +92,7 @@ func TestDialTimeout(t *testing.T) {
9392
}
9493

9594
func TestTLSDialTimeout(t *testing.T) {
96-
creds, err := credentials.NewClientTLSFromFile(tlsDir+"ca.pem", "x.test.youtube.com")
95+
creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), "x.test.youtube.com")
9796
if err != nil {
9897
t.Fatalf("Failed to create credentials %v", err)
9998
}
@@ -120,7 +119,7 @@ func TestDefaultAuthority(t *testing.T) {
120119

121120
func TestTLSServerNameOverwrite(t *testing.T) {
122121
overwriteServerName := "over.write.server.name"
123-
creds, err := credentials.NewClientTLSFromFile(tlsDir+"ca.pem", overwriteServerName)
122+
creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), overwriteServerName)
124123
if err != nil {
125124
t.Fatalf("Failed to create credentials %v", err)
126125
}
@@ -148,7 +147,7 @@ func TestWithAuthority(t *testing.T) {
148147

149148
func TestWithAuthorityAndTLS(t *testing.T) {
150149
overwriteServerName := "over.write.server.name"
151-
creds, err := credentials.NewClientTLSFromFile(tlsDir+"ca.pem", overwriteServerName)
150+
creds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), overwriteServerName)
152151
if err != nil {
153152
t.Fatalf("Failed to create credentials %v", err)
154153
}
@@ -219,7 +218,7 @@ func (c securePerRPCCredentials) RequireTransportSecurity() bool {
219218
}
220219

221220
func TestCredentialsMisuse(t *testing.T) {
222-
tlsCreds, err := credentials.NewClientTLSFromFile(tlsDir+"ca.pem", "x.test.youtube.com")
221+
tlsCreds, err := credentials.NewClientTLSFromFile(testdata.Path("ca.pem"), "x.test.youtube.com")
223222
if err != nil {
224223
t.Fatalf("Failed to create authenticator %v", err)
225224
}

credentials/credentials_test.go

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import (
2424
"testing"
2525

2626
"golang.org/x/net/context"
27+
"google.golang.org/grpc/testdata"
2728
)
2829

2930
func TestTLSOverrideServerName(t *testing.T) {
@@ -50,8 +51,6 @@ func TestTLSClone(t *testing.T) {
5051

5152
}
5253

53-
const tlsDir = "../test/testdata/"
54-
5554
type serverHandshake func(net.Conn) (AuthInfo, error)
5655

5756
func TestClientHandshakeReturnsAuthInfo(t *testing.T) {
@@ -162,7 +161,7 @@ func clientHandle(t *testing.T, hs func(net.Conn, string) (AuthInfo, error), lis
162161

163162
// Server handshake implementation in gRPC.
164163
func gRPCServerHandshake(conn net.Conn) (AuthInfo, error) {
165-
serverTLS, err := NewServerTLSFromFile(tlsDir+"server1.pem", tlsDir+"server1.key")
164+
serverTLS, err := NewServerTLSFromFile(testdata.Path("server1.pem"), testdata.Path("server1.key"))
166165
if err != nil {
167166
return nil, err
168167
}
@@ -184,7 +183,7 @@ func gRPCClientHandshake(conn net.Conn, lisAddr string) (AuthInfo, error) {
184183
}
185184

186185
func tlsServerHandshake(conn net.Conn) (AuthInfo, error) {
187-
cert, err := tls.LoadX509KeyPair(tlsDir+"server1.pem", tlsDir+"server1.key")
186+
cert, err := tls.LoadX509KeyPair(testdata.Path("server1.pem"), testdata.Path("server1.key"))
188187
if err != nil {
189188
return nil, err
190189
}

examples/route_guide/client/client.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ import (
3333
"google.golang.org/grpc/credentials"
3434
pb "google.golang.org/grpc/examples/route_guide/routeguide"
3535
"google.golang.org/grpc/grpclog"
36+
"google.golang.org/grpc/testdata"
3637
)
3738

3839
var (
3940
tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
40-
caFile = flag.String("ca_file", "testdata/ca.pem", "The file containning the CA root cert file")
41+
caFile = flag.String("ca_file", testdata.Path("ca.pem"), "The file containning the CA root cert file")
4142
serverAddr = flag.String("server_addr", "127.0.0.1:10000", "The server address in the format of host:port")
4243
serverHostOverride = flag.String("server_host_override", "x.test.youtube.com", "The server name use to verify the hostname returned by TLS handshake")
4344
)

examples/route_guide/server/server.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import (
3737

3838
"google.golang.org/grpc/credentials"
3939
"google.golang.org/grpc/grpclog"
40+
"google.golang.org/grpc/testdata"
4041

4142
"github.com/golang/protobuf/proto"
4243

@@ -45,8 +46,8 @@ import (
4546

4647
var (
4748
tls = flag.Bool("tls", false, "Connection uses TLS if true, else plain TCP")
48-
certFile = flag.String("cert_file", "testdata/server1.pem", "The TLS cert file")
49-
keyFile = flag.String("key_file", "testdata/server1.key", "The TLS key file")
49+
certFile = flag.String("cert_file", testdata.Path("server1.pem"), "The TLS cert file")
50+
keyFile = flag.String("key_file", testdata.Path("server1.key"), "The TLS key file")
5051
jsonDBFile = flag.String("json_db_file", "testdata/route_guide_db.json", "A json file containing a list of features")
5152
port = flag.Int("port", 10000, "The server port")
5253
)

0 commit comments

Comments
 (0)