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 'cmd/gitaly-ssh/auth_test.go')
-rw-r--r--cmd/gitaly-ssh/auth_test.go13
1 files changed, 11 insertions, 2 deletions
diff --git a/cmd/gitaly-ssh/auth_test.go b/cmd/gitaly-ssh/auth_test.go
index 070f2f453..5845598c3 100644
--- a/cmd/gitaly-ssh/auth_test.go
+++ b/cmd/gitaly-ssh/auth_test.go
@@ -6,6 +6,7 @@ import (
"os"
"os/exec"
"path"
+ "path/filepath"
"strconv"
"strings"
"testing"
@@ -44,6 +45,9 @@ func TestConnectivity(t *testing.T) {
socketPath := testhelper.GetTemporaryGitalySocketFileName()
+ relSocketPath, err := filepath.Rel("/", socketPath)
+ require.NoError(t, err)
+
tcpServer, tcpPort := runServer(t, server.NewInsecure, "tcp", "localhost:0")
defer tcpServer.Stop()
@@ -63,8 +67,12 @@ func TestConnectivity(t *testing.T) {
addr: fmt.Sprintf("tcp://localhost:%d", tcpPort),
},
{
- name: "unix",
- addr: fmt.Sprintf("unix://%s", socketPath),
+ name: "unix: absolute",
+ addr: "unix:" + socketPath,
+ },
+ {
+ name: "unix: relative",
+ addr: "unix:" + relSocketPath,
},
{
name: "unix_with_proxy",
@@ -87,6 +95,7 @@ func TestConnectivity(t *testing.T) {
t.Run(testcase.name, func(t *testing.T) {
cmd := exec.Command("git", "ls-remote", "git@localhost:test/test.git", "refs/heads/master")
cmd.Stderr = os.Stderr
+ cmd.Dir = "/"
cmd.Env = []string{
fmt.Sprintf("GITALY_PAYLOAD=%s", payload),
fmt.Sprintf("GITALY_ADDRESS=%s", testcase.addr),