diff options
| author | Paulo Gomes <pjbgf@linux.com> | 2023-08-05 10:20:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-05 10:20:38 +0100 |
| commit | e6f68d2e4cd1bc4447126816c7c27e1fc2098e30 (patch) | |
| tree | 15c5e333b93641f9eadcb4bf4b34c338135f7a23 /plumbing/transport/ssh/upload_pack_test.go | |
| parent | 5882d60fb7ccd4cfc0fe69286aa96e198c9d1eb0 (diff) | |
| parent | 4ec6b3f4fa9cdfe8f10d0953ac7d398d01a90f17 (diff) | |
| download | go-git-e6f68d2e4cd1bc4447126816c7c27e1fc2098e30.tar.gz | |
Merge branch 'master' into jc/commit-ammend
Diffstat (limited to 'plumbing/transport/ssh/upload_pack_test.go')
| -rw-r--r-- | plumbing/transport/ssh/upload_pack_test.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plumbing/transport/ssh/upload_pack_test.go b/plumbing/transport/ssh/upload_pack_test.go index e65e04a..67af566 100644 --- a/plumbing/transport/ssh/upload_pack_test.go +++ b/plumbing/transport/ssh/upload_pack_test.go @@ -3,7 +3,6 @@ package ssh import ( "fmt" "io" - "io/ioutil" "log" "net" "os" @@ -14,6 +13,7 @@ import ( "sync" "github.com/go-git/go-git/v5/plumbing/transport" + testutils "github.com/go-git/go-git/v5/plumbing/transport/ssh/internal/test" "github.com/go-git/go-git/v5/plumbing/transport/test" "github.com/gliderlabs/ssh" @@ -25,6 +25,7 @@ import ( type UploadPackSuite struct { test.UploadPackSuite fixtures.Suite + opts []ssh.Option port int base string @@ -41,7 +42,7 @@ func (s *UploadPackSuite) SetUpSuite(c *C) { c.Assert(err, IsNil) s.port = l.Addr().(*net.TCPAddr).Port - s.base, err = ioutil.TempDir(os.TempDir(), fmt.Sprintf("go-git-ssh-%d", s.port)) + s.base, err = os.MkdirTemp(os.TempDir(), fmt.Sprintf("go-git-ssh-%d", s.port)) c.Assert(err, IsNil) DefaultAuthBuilder = func(user string) (AuthMethod, error) { @@ -56,7 +57,10 @@ func (s *UploadPackSuite) SetUpSuite(c *C) { s.UploadPackSuite.EmptyEndpoint = s.prepareRepository(c, fixtures.ByTag("empty").One(), "empty.git") s.UploadPackSuite.NonExistentEndpoint = s.newEndpoint(c, "non-existent.git") - server := &ssh.Server{Handler: handlerSSH} + server := &ssh.Server{Handler: testutils.HandlerSSH} + for _, opt := range s.opts { + opt(server) + } go func() { log.Fatal(server.Serve(l)) }() |