diff options
author | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 01:41:19 +0100 |
---|---|---|
committer | Máximo Cuadros <mcuadros@gmail.com> | 2020-03-10 01:41:19 +0100 |
commit | 2637279338ca9736c22b5e15fca916121ae8d089 (patch) | |
tree | 2273e55f2d2b68b9b6335924d6b00ddf3417e8e7 /plumbing/transport/file | |
parent | 2bdfd91f04068220a72feeade31defc09f2a601e (diff) | |
download | go-git-2637279338ca9736c22b5e15fca916121ae8d089.tar.gz |
*: migration from go-git-fixtures/v4 and go-git/gcfg
Diffstat (limited to 'plumbing/transport/file')
-rw-r--r-- | plumbing/transport/file/common_test.go | 4 | ||||
-rw-r--r-- | plumbing/transport/file/receive_pack_test.go | 2 | ||||
-rw-r--r-- | plumbing/transport/file/server_test.go | 2 | ||||
-rw-r--r-- | plumbing/transport/file/upload_pack_test.go | 6 |
4 files changed, 5 insertions, 9 deletions
diff --git a/plumbing/transport/file/common_test.go b/plumbing/transport/file/common_test.go index 99866d7..4d6612b 100644 --- a/plumbing/transport/file/common_test.go +++ b/plumbing/transport/file/common_test.go @@ -6,8 +6,8 @@ import ( "os/exec" "path/filepath" + fixtures "github.com/go-git/go-git-fixtures/v4" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git-fixtures.v3" ) type CommonSuite struct { @@ -20,8 +20,6 @@ type CommonSuite struct { var _ = Suite(&CommonSuite{}) func (s *CommonSuite) SetUpSuite(c *C) { - s.Suite.SetUpSuite(c) - if err := exec.Command("git", "--version").Run(); err != nil { c.Skip("git command not found") } diff --git a/plumbing/transport/file/receive_pack_test.go b/plumbing/transport/file/receive_pack_test.go index 46a0017..2ee4b86 100644 --- a/plumbing/transport/file/receive_pack_test.go +++ b/plumbing/transport/file/receive_pack_test.go @@ -6,7 +6,7 @@ import ( "github.com/go-git/go-git/v5/plumbing/transport/test" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git-fixtures.v3" + "github.com/go-git/go-git-fixtures/v4" ) type ReceivePackSuite struct { diff --git a/plumbing/transport/file/server_test.go b/plumbing/transport/file/server_test.go index 1793c0f..b6ac4e0 100644 --- a/plumbing/transport/file/server_test.go +++ b/plumbing/transport/file/server_test.go @@ -4,8 +4,8 @@ import ( "os" "os/exec" + "github.com/go-git/go-git-fixtures/v4" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git-fixtures.v3" ) type ServerSuite struct { diff --git a/plumbing/transport/file/upload_pack_test.go b/plumbing/transport/file/upload_pack_test.go index 1f210aa..fe7c6af 100644 --- a/plumbing/transport/file/upload_pack_test.go +++ b/plumbing/transport/file/upload_pack_test.go @@ -2,13 +2,12 @@ package file import ( "os" - "path/filepath" "github.com/go-git/go-git/v5/plumbing/transport" "github.com/go-git/go-git/v5/plumbing/transport/test" + fixtures "github.com/go-git/go-git-fixtures/v4" . "gopkg.in/check.v1" - "gopkg.in/src-d/go-git-fixtures.v3" ) type UploadPackSuite struct { @@ -35,8 +34,7 @@ func (s *UploadPackSuite) SetUpSuite(c *C) { c.Assert(err, IsNil) s.EmptyEndpoint = ep - path = filepath.Join(fixtures.DataFolder, "non-existent") - ep, err = transport.NewEndpoint(path) + ep, err = transport.NewEndpoint("non-existent") c.Assert(err, IsNil) s.NonExistentEndpoint = ep } |