From caa4dc4729e50e3a10ccd438d02d69fa20f9b766 Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Thu, 23 Nov 2017 07:19:39 +0100 Subject: update to go-billy.v4 and go-git-fixtures.v3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Máximo Cuadros --- plumbing/transport/file/common_test.go | 3 +-- plumbing/transport/file/receive_pack_test.go | 2 +- plumbing/transport/file/server_test.go | 3 +-- plumbing/transport/file/upload_pack_test.go | 2 +- plumbing/transport/git/common_test.go | 5 +++-- plumbing/transport/git/receive_pack_test.go | 2 +- plumbing/transport/git/upload_pack_test.go | 2 +- plumbing/transport/http/common_test.go | 3 +-- plumbing/transport/http/receive_pack_test.go | 2 +- plumbing/transport/http/upload_pack_test.go | 3 +-- plumbing/transport/server/loader.go | 4 ++-- plumbing/transport/server/server_test.go | 2 +- plumbing/transport/ssh/upload_pack_test.go | 2 +- plumbing/transport/test/receive_pack.go | 2 +- 14 files changed, 17 insertions(+), 20 deletions(-) (limited to 'plumbing/transport') diff --git a/plumbing/transport/file/common_test.go b/plumbing/transport/file/common_test.go index 4f3ae8f..99866d7 100644 --- a/plumbing/transport/file/common_test.go +++ b/plumbing/transport/file/common_test.go @@ -6,9 +6,8 @@ import ( "os/exec" "path/filepath" - "github.com/src-d/go-git-fixtures" - . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type CommonSuite struct { diff --git a/plumbing/transport/file/receive_pack_test.go b/plumbing/transport/file/receive_pack_test.go index a7dc399..3e7b140 100644 --- a/plumbing/transport/file/receive_pack_test.go +++ b/plumbing/transport/file/receive_pack_test.go @@ -3,10 +3,10 @@ package file import ( "os" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing/transport/test" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type ReceivePackSuite struct { diff --git a/plumbing/transport/file/server_test.go b/plumbing/transport/file/server_test.go index 080beef..1793c0f 100644 --- a/plumbing/transport/file/server_test.go +++ b/plumbing/transport/file/server_test.go @@ -4,9 +4,8 @@ import ( "os" "os/exec" - "github.com/src-d/go-git-fixtures" - . "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 9a922d1..0b9b562 100644 --- a/plumbing/transport/file/upload_pack_test.go +++ b/plumbing/transport/file/upload_pack_test.go @@ -4,11 +4,11 @@ import ( "os" "path/filepath" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/plumbing/transport/test" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type UploadPackSuite struct { diff --git a/plumbing/transport/git/common_test.go b/plumbing/transport/git/common_test.go index bdc326f..61097e7 100644 --- a/plumbing/transport/git/common_test.go +++ b/plumbing/transport/git/common_test.go @@ -11,9 +11,10 @@ import ( "testing" "time" - "github.com/src-d/go-git-fixtures" - . "gopkg.in/check.v1" "gopkg.in/src-d/go-git.v4/plumbing/transport" + + . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) func Test(t *testing.T) { TestingT(t) } diff --git a/plumbing/transport/git/receive_pack_test.go b/plumbing/transport/git/receive_pack_test.go index 7973dc0..fa10735 100644 --- a/plumbing/transport/git/receive_pack_test.go +++ b/plumbing/transport/git/receive_pack_test.go @@ -1,10 +1,10 @@ package git import ( - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing/transport/test" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type ReceivePackSuite struct { diff --git a/plumbing/transport/git/upload_pack_test.go b/plumbing/transport/git/upload_pack_test.go index 6c29c8b..7058564 100644 --- a/plumbing/transport/git/upload_pack_test.go +++ b/plumbing/transport/git/upload_pack_test.go @@ -1,10 +1,10 @@ package git import ( - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing/transport/test" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type UploadPackSuite struct { diff --git a/plumbing/transport/http/common_test.go b/plumbing/transport/http/common_test.go index c2c0d3e..8d57996 100644 --- a/plumbing/transport/http/common_test.go +++ b/plumbing/transport/http/common_test.go @@ -14,11 +14,10 @@ import ( "strings" "testing" - fixtures "github.com/src-d/go-git-fixtures" - "gopkg.in/src-d/go-git.v4/plumbing/transport" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) func Test(t *testing.T) { TestingT(t) } diff --git a/plumbing/transport/http/receive_pack_test.go b/plumbing/transport/http/receive_pack_test.go index aed375d..737d792 100644 --- a/plumbing/transport/http/receive_pack_test.go +++ b/plumbing/transport/http/receive_pack_test.go @@ -3,7 +3,7 @@ package http import ( "gopkg.in/src-d/go-git.v4/plumbing/transport/test" - "github.com/src-d/go-git-fixtures" + "gopkg.in/src-d/go-git-fixtures.v3" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/http/upload_pack_test.go b/plumbing/transport/http/upload_pack_test.go index 6c90386..fbd28c7 100644 --- a/plumbing/transport/http/upload_pack_test.go +++ b/plumbing/transport/http/upload_pack_test.go @@ -6,14 +6,13 @@ import ( "os" "path/filepath" - fixtures "github.com/src-d/go-git-fixtures" - "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/plumbing/transport/test" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type UploadPackSuite struct { diff --git a/plumbing/transport/server/loader.go b/plumbing/transport/server/loader.go index 3af55e1..c83752c 100644 --- a/plumbing/transport/server/loader.go +++ b/plumbing/transport/server/loader.go @@ -5,8 +5,8 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-billy.v3" - "gopkg.in/src-d/go-billy.v3/osfs" + "gopkg.in/src-d/go-billy.v4" + "gopkg.in/src-d/go-billy.v4/osfs" ) // DefaultLoader is a filesystem loader ignoring host and resolving paths to /. diff --git a/plumbing/transport/server/server_test.go b/plumbing/transport/server/server_test.go index 335aeae..33d74d1 100644 --- a/plumbing/transport/server/server_test.go +++ b/plumbing/transport/server/server_test.go @@ -3,7 +3,6 @@ package server_test import ( "testing" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing/transport" "gopkg.in/src-d/go-git.v4/plumbing/transport/client" "gopkg.in/src-d/go-git.v4/plumbing/transport/server" @@ -12,6 +11,7 @@ import ( "gopkg.in/src-d/go-git.v4/storage/memory" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) func Test(t *testing.T) { TestingT(t) } diff --git a/plumbing/transport/ssh/upload_pack_test.go b/plumbing/transport/ssh/upload_pack_test.go index f6696d1..56d1601 100644 --- a/plumbing/transport/ssh/upload_pack_test.go +++ b/plumbing/transport/ssh/upload_pack_test.go @@ -15,7 +15,7 @@ import ( "gopkg.in/src-d/go-git.v4/plumbing/transport/test" "github.com/gliderlabs/ssh" - "github.com/src-d/go-git-fixtures" + "gopkg.in/src-d/go-git-fixtures.v3" stdssh "golang.org/x/crypto/ssh" . "gopkg.in/check.v1" ) diff --git a/plumbing/transport/test/receive_pack.go b/plumbing/transport/test/receive_pack.go index e089c54..0f3352c 100644 --- a/plumbing/transport/test/receive_pack.go +++ b/plumbing/transport/test/receive_pack.go @@ -9,7 +9,6 @@ import ( "io" "io/ioutil" - "github.com/src-d/go-git-fixtures" "gopkg.in/src-d/go-git.v4/plumbing" "gopkg.in/src-d/go-git.v4/plumbing/format/packfile" "gopkg.in/src-d/go-git.v4/plumbing/protocol/packp" @@ -18,6 +17,7 @@ import ( "gopkg.in/src-d/go-git.v4/storage/memory" . "gopkg.in/check.v1" + "gopkg.in/src-d/go-git-fixtures.v3" ) type ReceivePackSuite struct { -- cgit