diff options
Diffstat (limited to 'repository_test.go')
| -rw-r--r-- | repository_test.go | 67 |
1 files changed, 29 insertions, 38 deletions
diff --git a/repository_test.go b/repository_test.go index 2d9fd14..3ca4d0d 100644 --- a/repository_test.go +++ b/repository_test.go @@ -4,10 +4,7 @@ import ( "fmt" "os" - "gopkg.in/src-d/go-git.v4/clients/http" "gopkg.in/src-d/go-git.v4/core" - "gopkg.in/src-d/go-git.v4/storage/filesystem" - "gopkg.in/src-d/go-git.v4/utils/fs" "github.com/alcortesm/tgz" . "gopkg.in/check.v1" @@ -20,7 +17,7 @@ var dirFixturesInit = [...]struct { }{ { name: "binrels", - tgz: "storage/filesystem/internal/gitdir/fixtures/alcortesm-binary-relations.tgz", + tgz: "storage/filesystem/internal/dotgit/fixtures/alcortesm-binary-relations.tgz", head: "c44b5176e99085c8fe36fa27b045590a7b9d34c9", }, } @@ -30,14 +27,15 @@ type dirFixture struct { head core.Hash } -type SuiteRepository struct { +type RepositorySuite struct { + BaseSuite repos map[string]*Repository dirFixtures map[string]dirFixture } -var _ = Suite(&SuiteRepository{}) +var _ = Suite(&RepositorySuite{}) -func (s *SuiteRepository) SetUpSuite(c *C) { +func (s *RepositorySuite) SetUpSuite(c *C) { s.repos = unpackFixtures(c, tagFixtures, treeWalkerFixtures) s.dirFixtures = make(map[string]dirFixture, len(dirFixturesInit)) @@ -54,7 +52,7 @@ func (s *SuiteRepository) SetUpSuite(c *C) { } } -func (s *SuiteRepository) TearDownSuite(c *C) { +func (s *RepositorySuite) TearDownSuite(c *C) { for name, fix := range s.dirFixtures { err := os.RemoveAll(fix.path) c.Assert(err, IsNil, Commentf("cannot delete tmp dir for fixture %s: %s\n", @@ -62,20 +60,22 @@ func (s *SuiteRepository) TearDownSuite(c *C) { } } -func (s *SuiteRepository) TestNewRepository(c *C) { +/* +func (s *RepositorySuite) TestNewRepository(c *C) { r, err := NewRepository(RepositoryFixture, nil) c.Assert(err, IsNil) c.Assert(r.Remotes["origin"].Auth, IsNil) } -func (s *SuiteRepository) TestNewRepositoryWithAuth(c *C) { +func (s *RepositorySuite) TestNewRepositoryWithAuth(c *C) { auth := &http.BasicAuth{} r, err := NewRepository(RepositoryFixture, auth) c.Assert(err, IsNil) c.Assert(r.Remotes["origin"].Auth, Equals, auth) } -func (s *SuiteRepository) TestNewRepositoryFromFS(c *C) { + +func (s *RepositorySuite) TestNewRepositoryFromFS(c *C) { for name, fix := range s.dirFixtures { fs := fs.NewOS() gitPath := fs.Join(fix.path, ".git/") @@ -91,7 +91,8 @@ func (s *SuiteRepository) TestNewRepositoryFromFS(c *C) { } } -func (s *SuiteRepository) TestPull(c *C) { + +func (s *RepositorySuite) TestClone(c *C) { r, err := NewRepository(RepositoryFixture, nil) r.Remotes["origin"].upSrv = &MockGitUploadPackService{} @@ -104,21 +105,8 @@ func (s *SuiteRepository) TestPull(c *C) { c.Assert(err, Not(IsNil), Commentf("pull leaks an open fd from the fetch")) } -func (s *SuiteRepository) TestPullDefault(c *C) { - r, err := NewRepository(RepositoryFixture, nil) - r.Remotes[DefaultRemoteName].Connect() - r.Remotes[DefaultRemoteName].upSrv = &MockGitUploadPackService{} - - c.Assert(err, IsNil) - c.Assert(r.PullDefault(), IsNil) - mock, ok := (r.Remotes[DefaultRemoteName].upSrv).(*MockGitUploadPackService) - c.Assert(ok, Equals, true) - err = mock.RC.Close() - c.Assert(err, Not(IsNil), Commentf("pull leaks an open fd from the fetch")) -} - -func (s *SuiteRepository) TestCommit(c *C) { +func (s *RepositorySuite) TestCommit(c *C) { r, err := NewRepository(RepositoryFixture, nil) r.Remotes["origin"].upSrv = &MockGitUploadPackService{} @@ -136,13 +124,14 @@ func (s *SuiteRepository) TestCommit(c *C) { c.Assert(commit.Tree().Hash.IsZero(), Equals, false) c.Assert(commit.Author.Email, Equals, "daniel@lordran.local") } +*/ -func (s *SuiteRepository) TestCommits(c *C) { - r, err := NewRepository(RepositoryFixture, nil) - r.Remotes["origin"].upSrv = &MockGitUploadPackService{} +func (s *RepositorySuite) TestCommits(c *C) { + r, err := NewMemoryRepository() + c.Assert(err, IsNil) + err = r.Clone(&CloneOptions{URL: RepositoryFixture}) c.Assert(err, IsNil) - c.Assert(r.Pull("origin", "refs/heads/master"), IsNil) count := 0 commits, err := r.Commits() @@ -157,13 +146,12 @@ func (s *SuiteRepository) TestCommits(c *C) { c.Assert(commit.Hash.IsZero(), Equals, false) c.Assert(commit.Hash, Equals, commit.ID()) c.Assert(commit.Type(), Equals, core.CommitObject) - //c.Assert(commit.Tree.IsZero(), Equals, false) } c.Assert(count, Equals, 8) } -func (s *SuiteRepository) TestTag(c *C) { +func (s *RepositorySuite) TestTag(c *C) { for i, t := range tagTests { r, ok := s.repos[t.repo] c.Assert(ok, Equals, true) @@ -178,7 +166,7 @@ func (s *SuiteRepository) TestTag(c *C) { } } -func (s *SuiteRepository) TestTags(c *C) { +func (s *RepositorySuite) TestTags(c *C) { for i, t := range tagTests { r, ok := s.repos[t.repo] c.Assert(ok, Equals, true) @@ -188,7 +176,7 @@ func (s *SuiteRepository) TestTags(c *C) { } } -func (s *SuiteRepository) TestObject(c *C) { +func (s *RepositorySuite) TestObject(c *C) { for i, t := range treeWalkerTests { r, ok := s.repos[t.repo] c.Assert(ok, Equals, true) @@ -204,7 +192,8 @@ func (s *SuiteRepository) TestObject(c *C) { } } -func (s *SuiteRepository) TestCommitIterClosePanic(c *C) { +/* +func (s *RepositorySuite) TestCommitIterClosePanic(c *C) { r, err := NewRepository(RepositoryFixture, nil) r.Remotes["origin"].upSrv = &MockGitUploadPackService{} @@ -216,7 +205,8 @@ func (s *SuiteRepository) TestCommitIterClosePanic(c *C) { commits.Close() } -func (s *SuiteRepository) TestHeadFromFs(c *C) { + +func (s *RepositorySuite) TestHeadFromFs(c *C) { for name, fix := range s.dirFixtures { fs := fs.NewOS() gitPath := fs.Join(fix.path, ".git/") @@ -231,7 +221,7 @@ func (s *SuiteRepository) TestHeadFromFs(c *C) { } } -func (s *SuiteRepository) TestHeadFromRemote(c *C) { +func (s *RepositorySuite) TestHeadFromRemote(c *C) { r, err := NewRepository(RepositoryFixture, nil) c.Assert(err, IsNil) @@ -250,7 +240,7 @@ func (s *SuiteRepository) TestHeadFromRemote(c *C) { c.Assert(obtained, Equals, expected) } -func (s *SuiteRepository) TestHeadErrors(c *C) { +func (s *RepositorySuite) TestHeadErrors(c *C) { r, err := NewRepository(RepositoryFixture, nil) c.Assert(err, IsNil) @@ -265,3 +255,4 @@ func (s *SuiteRepository) TestHeadErrors(c *C) { _, err = r.Head(remote) c.Assert(err, ErrorMatches, "cannot retrieve local head: no local data found") } +*/ |