Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'internal/service/ssh/upload_pack_test.go')
-rw-r--r--internal/service/ssh/upload_pack_test.go24
1 files changed, 12 insertions, 12 deletions
diff --git a/internal/service/ssh/upload_pack_test.go b/internal/service/ssh/upload_pack_test.go
index d3936461d..67e5b366a 100644
--- a/internal/service/ssh/upload_pack_test.go
+++ b/internal/service/ssh/upload_pack_test.go
@@ -21,9 +21,9 @@ import (
)
func TestFailedUploadPackRequestDueToTimeout(t *testing.T) {
- server, serverSocketPath := runSSHServer(t, WithUploadPackRequestTimeout(10*time.Microsecond))
+ stop, serverSocketPath := runSSHServer(t, WithUploadPackRequestTimeout(10*time.Microsecond))
- defer server.Stop()
+ defer stop()
client, conn := newSSHClient(t, serverSocketPath)
defer conn.Close()
@@ -77,8 +77,8 @@ func requireFailedSSHStream(t *testing.T, recv func() (int32, error)) {
}
func TestFailedUploadPackRequestDueToValidationError(t *testing.T) {
- server, serverSocketPath := runSSHServer(t)
- defer server.Stop()
+ stop, serverSocketPath := runSSHServer(t)
+ defer stop()
client, conn := newSSHClient(t, serverSocketPath)
defer conn.Close()
@@ -126,8 +126,8 @@ func TestFailedUploadPackRequestDueToValidationError(t *testing.T) {
}
func TestUploadPackCloneSuccess(t *testing.T) {
- server, serverSocketPath := runSSHServer(t)
- defer server.Stop()
+ stop, serverSocketPath := runSSHServer(t)
+ defer stop()
localRepoPath := path.Join(testRepoRoot, "gitlab-test-upload-pack-local")
@@ -158,8 +158,8 @@ func TestUploadPackCloneSuccessWithGitProtocol(t *testing.T) {
restore := testhelper.EnableGitProtocolV2Support()
defer restore()
- server, serverSocketPath := runSSHServer(t)
- defer server.Stop()
+ stop, serverSocketPath := runSSHServer(t)
+ defer stop()
localRepoPath := path.Join(testRepoRoot, "gitlab-test-upload-pack-local")
@@ -192,8 +192,8 @@ func TestUploadPackCloneSuccessWithGitProtocol(t *testing.T) {
}
func TestUploadPackCloneHideTags(t *testing.T) {
- server, serverSocketPath := runSSHServer(t)
- defer server.Stop()
+ stop, serverSocketPath := runSSHServer(t)
+ defer stop()
localRepoPath := path.Join(testRepoRoot, "gitlab-test-upload-pack-local-hide-tags")
@@ -213,8 +213,8 @@ func TestUploadPackCloneHideTags(t *testing.T) {
}
func TestUploadPackCloneFailure(t *testing.T) {
- server, serverSocketPath := runSSHServer(t)
- defer server.Stop()
+ stop, serverSocketPath := runSSHServer(t)
+ defer stop()
localRepoPath := path.Join(testRepoRoot, "gitlab-test-upload-pack-local-failure")