1 files changed, 11 insertions, 23 deletions
diff --git a/internal/gitaly/service/repository/info_attributes_test.go b/internal/gitaly/service/repository/info_attributes_test.go
index 3a682c9c1..984906469 100644
--- a/internal/gitaly/service/repository/info_attributes_test.go
+++ b/internal/gitaly/service/repository/info_attributes_test.go
@@ -6,20 +6,13 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/stretchr/testify/require"
-	"gitlab.com/gitlab-org/gitaly/internal/gitaly/config"
 	"gitlab.com/gitlab-org/gitaly/internal/testhelper"
 	"gitlab.com/gitlab-org/gitaly/proto/go/gitalypb"
 	"gitlab.com/gitlab-org/gitaly/streamio"
 )
 
 func (suite *RepositoryServiceTestSuite) TestGetInfoAttributesExisting() {
-	locator := config.NewLocator(config.Config)
-	serverSocketPath, stop := runRepoServer(suite.T(), locator)
-	defer stop()
-
-	client, conn := newRepositoryClient(suite.T(), serverSocketPath)
-	defer conn.Close()
+	require := suite.Require()
 
 	infoPath := filepath.Join(suite.repositoryPath, "info")
 	os.MkdirAll(infoPath, 0755)
@@ -28,41 +21,36 @@ func (suite *RepositoryServiceTestSuite) TestGetInfoAttributesExisting() {
 	data := bytes.Repeat([]byte("*.pbxproj binary\n"), buffSize)
 	attrsPath := filepath.Join(infoPath, "attributes")
 	err := ioutil.WriteFile(attrsPath, data, 0644)
-	require.NoError(suite.T(), err)
+	require.NoError(err)
 
 	request := &gitalypb.GetInfoAttributesRequest{Repository: suite.repository}
 	testCtx, cancelCtx := testhelper.Context()
 	defer cancelCtx()
 
-	stream, err := client.GetInfoAttributes(testCtx, request)
-	require.NoError(suite.T(), err)
+	stream, err := suite.client.GetInfoAttributes(testCtx, request)
+	require.NoError(err)
 
 	receivedData, err := ioutil.ReadAll(streamio.NewReader(func() ([]byte, error) {
 		response, err := stream.Recv()
 		return response.GetAttributes(), err
 	}))
 
-	require.NoError(suite.T(), err)
-	require.Equal(suite.T(), data, receivedData)
+	require.NoError(err)
+	require.Equal(data, receivedData)
 }
 
 func (suite *RepositoryServiceTestSuite) TestGetInfoAttributesNonExisting() {
-	locator := config.NewLocator(config.Config)
-	serverSocketPath, stop := runRepoServer(suite.T(), locator)
-	defer stop()
-
-	client, conn := newRepositoryClient(suite.T(), serverSocketPath)
-	defer conn.Close()
+	require := suite.Require()
 
 	request := &gitalypb.GetInfoAttributesRequest{Repository: suite.repository}
 	testCtx, cancelCtx := testhelper.Context()
 	defer cancelCtx()
 
-	response, err := client.GetInfoAttributes(testCtx, request)
-	require.NoError(suite.T(), err)
+	response, err := suite.client.GetInfoAttributes(testCtx, request)
+	require.NoError(err)
 
 	message, err := response.Recv()
-	require.NoError(suite.T(), err)
+	require.NoError(err)
 
-	require.Empty(suite.T(), message.GetAttributes())
+	require.Empty(message.GetAttributes())
 }