Move {test/bufconn => mtls/bufconn_test}.go

andrejtokarcik · Oct 28, 2020 · d7efdff · d7efdff
1 parent de8ef72
commit d7efdff
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 10 deletions.
diff --git a/test/bufconn.go → mtls/bufconn_test.go b/test/bufconn.go → mtls/bufconn_test.go
@@ -1,4 +1,4 @@
-package test
+package mtls_test
 
 import (
 	"context"
@@ -10,6 +10,7 @@ import (
 	"google.golang.org/grpc/test/bufconn"
 
 	"github.com/andrejtokarcik/jobworker/client"
+	"github.com/andrejtokarcik/jobworker/server"
 )
 
 type BufconnConfig struct {
@@ -32,8 +33,8 @@ func NewBufconnSuite() (suite BufconnSuite) {
 	return
 }
 
-func (suite *BufconnSuite) SetupBufconn(grpcServer *grpc.Server) {
-	suite.grpcServer = grpcServer
+func (suite *BufconnSuite) SetupBufconn(opts ...grpc.ServerOption) {
+	suite.grpcServer = server.New(opts...)
 	suite.listener = bufconn.Listen(suite.BufSize)
 	go func() {
 		if err := suite.grpcServer.Serve(suite.listener); err != nil {

diff --git a/mtls/mtls_test.go b/mtls/mtls_test.go
@@ -8,11 +8,10 @@ import (
 	"google.golang.org/grpc"
 
 	"github.com/andrejtokarcik/jobworker/mtls"
-	"github.com/andrejtokarcik/jobworker/test"
 )
 
 type mTLSTestSuite struct {
-	test.BufconnSuite
+	BufconnSuite
 }
 
 type mTLSTestCase struct {
@@ -31,8 +30,7 @@ func (suite *mTLSTestSuite) SetupSuite() {
 		panic(err)
 	}
 
-	grpcServer := grpc.NewServer(grpc.Creds(serverCreds))
-	suite.SetupBufconn(grpcServer)
+	suite.SetupBufconn(grpc.Creds(serverCreds))
 }
 
 func (suite *mTLSTestSuite) TearDownSuite() {
@@ -41,7 +39,7 @@ func (suite *mTLSTestSuite) TearDownSuite() {
 
 func (suite *mTLSTestSuite) runTestCase(tc mTLSTestCase) {
 	clientCreds, err := mtls.NewClientCreds(tc.clientCredsFiles)
-	suite.Require().Nil(err)
+	suite.Require().Nil(err, err)
 
 	conn, err := suite.DialBufconn(
 		tc.serverName,
@@ -52,7 +50,7 @@ func (suite *mTLSTestSuite) runTestCase(tc mTLSTestCase) {
 	}
 
 	if tc.expectedErr == nil {
-		suite.Require().Nil(err)
+		suite.Require().Nil(err, err)
 	} else {
 		suite.Require().NotNil(err)
 		suite.Assert().Contains(err.Error(), tc.expectedErr.Error())
@@ -99,5 +97,5 @@ func (suite *mTLSTestSuite) TestInvalidServerName() {
 }
 
 func TestMutualTLS(t *testing.T) {
-	suite.Run(t, &mTLSTestSuite{test.NewBufconnSuite()})
+	suite.Run(t, &mTLSTestSuite{NewBufconnSuite()})
 }