From 80179adaab815eaf75099a5ff31e48c6bd07d1dc Mon Sep 17 00:00:00 2001 From: Máximo Cuadros Date: Mon, 30 Jan 2017 22:03:19 +0100 Subject: rename billy imports --- storage/filesystem/config_test.go | 9 ++++----- storage/filesystem/internal/dotgit/dotgit_test.go | 3 +-- storage/filesystem/internal/dotgit/writers_test.go | 3 +-- storage/filesystem/storage_test.go | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) (limited to 'storage') diff --git a/storage/filesystem/config_test.go b/storage/filesystem/config_test.go index 6fbf826..17ecec8 100644 --- a/storage/filesystem/config_test.go +++ b/storage/filesystem/config_test.go @@ -2,14 +2,13 @@ package filesystem import ( "io/ioutil" - stdos "os" + "os" "gopkg.in/src-d/go-git.v4/fixtures" "gopkg.in/src-d/go-git.v4/storage/filesystem/internal/dotgit" - "srcd.works/go-billy.v1/os" - . "gopkg.in/check.v1" + "srcd.works/go-billy.v1/osfs" ) type ConfigSuite struct { @@ -25,7 +24,7 @@ func (s *ConfigSuite) SetUpTest(c *C) { tmp, err := ioutil.TempDir("", "go-git-filestystem-config") c.Assert(err, IsNil) - s.dir = dotgit.New(os.New(tmp)) + s.dir = dotgit.New(osfs.New(tmp)) s.path = tmp } @@ -46,5 +45,5 @@ func (s *ConfigSuite) TestRemotes(c *C) { } func (s *ConfigSuite) TearDownTest(c *C) { - defer stdos.RemoveAll(s.path) + defer os.RemoveAll(s.path) } diff --git a/storage/filesystem/internal/dotgit/dotgit_test.go b/storage/filesystem/internal/dotgit/dotgit_test.go index bff90af..eb11478 100644 --- a/storage/filesystem/internal/dotgit/dotgit_test.go +++ b/storage/filesystem/internal/dotgit/dotgit_test.go @@ -10,9 +10,8 @@ import ( "gopkg.in/src-d/go-git.v4/fixtures" "gopkg.in/src-d/go-git.v4/plumbing" - osfs "srcd.works/go-billy.v1/os" - . "gopkg.in/check.v1" + "srcd.works/go-billy.v1/osfs" ) func Test(t *testing.T) { TestingT(t) } diff --git a/storage/filesystem/internal/dotgit/writers_test.go b/storage/filesystem/internal/dotgit/writers_test.go index c546a3a..65ef5dc 100644 --- a/storage/filesystem/internal/dotgit/writers_test.go +++ b/storage/filesystem/internal/dotgit/writers_test.go @@ -10,9 +10,8 @@ import ( "gopkg.in/src-d/go-git.v4/fixtures" - osfs "srcd.works/go-billy.v1/os" - . "gopkg.in/check.v1" + "srcd.works/go-billy.v1/osfs" ) func (s *SuiteDotGit) TestNewObjectPack(c *C) { diff --git a/storage/filesystem/storage_test.go b/storage/filesystem/storage_test.go index 0e8ffb3..c48fdd2 100644 --- a/storage/filesystem/storage_test.go +++ b/storage/filesystem/storage_test.go @@ -5,9 +5,8 @@ import ( "gopkg.in/src-d/go-git.v4/storage/test" - "srcd.works/go-billy.v1/os" - . "gopkg.in/check.v1" + "srcd.works/go-billy.v1/osfs" ) func Test(t *testing.T) { TestingT(t) } @@ -19,7 +18,7 @@ type StorageSuite struct { var _ = Suite(&StorageSuite{}) func (s *StorageSuite) SetUpTest(c *C) { - storage, err := NewStorage(os.New(c.MkDir())) + storage, err := NewStorage(osfs.New(c.MkDir())) c.Assert(err, IsNil) s.BaseStorageSuite = test.NewBaseStorageSuite(storage) -- cgit