Skip to content
This repository was archived by the owner on Sep 11, 2020. It is now read-only.

Commit b8eac90

Browse files
committed
TestList: explicitly check the refs in fixture
1 parent 4d0c2cc commit b8eac90

File tree

1 file changed

+21
-27
lines changed

1 file changed

+21
-27
lines changed

remote_test.go

Lines changed: 21 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -644,38 +644,32 @@ func (s *RemoteSuite) TestGetHaves(c *C) {
644644
}
645645

646646
func (s *RemoteSuite) TestList(c *C) {
647-
url := c.MkDir()
648-
server, err := PlainInit(url, true)
649-
c.Assert(err, IsNil)
650-
651-
srcFs := fixtures.Basic().One().DotGit()
652-
sto, err := filesystem.NewStorage(srcFs)
653-
c.Assert(err, IsNil)
654-
655-
remote := newRemote(sto, &config.RemoteConfig{
647+
repo := fixtures.Basic().One()
648+
remote := newRemote(memory.NewStorage(), &config.RemoteConfig{
656649
Name: DefaultRemoteName,
657-
URLs: []string{url},
650+
URLs: []string{repo.URL},
658651
})
659652

660-
rs := config.RefSpec("refs/heads/*:refs/heads/*")
661-
err = remote.Push(&PushOptions{
662-
RefSpecs: []config.RefSpec{rs},
663-
})
653+
refs, err := remote.List(&ListOptions{})
664654
c.Assert(err, IsNil)
665655

666-
listOptions := ListOptions{}
667-
refs, err := remote.List(&listOptions)
668-
c.Assert(err, IsNil)
669-
670-
// Create a map of remote name and their hash.
671-
refsMap := map[string]string{}
672-
for _, rf := range refs {
673-
// Skip the symbolically linked HEAD.
674-
if string(rf.Name()) == "HEAD" {
675-
continue
656+
expected := []*plumbing.Reference{
657+
plumbing.NewSymbolicReference("HEAD", "refs/heads/master"),
658+
plumbing.NewReferenceFromStrings("refs/heads/master", "6ecf0ef2c2dffb796033e5a02219af86ec6584e5"),
659+
plumbing.NewReferenceFromStrings("refs/heads/branch", "e8d3ffab552895c19b9fcf7aa264d277cde33881"),
660+
plumbing.NewReferenceFromStrings("refs/pull/1/head", "b8e471f58bcbca63b07bda20e428190409c2db47"),
661+
plumbing.NewReferenceFromStrings("refs/pull/2/head", "9632f02833b2f9613afb5e75682132b0b22e4a31"),
662+
plumbing.NewReferenceFromStrings("refs/pull/2/merge", "c37f58a130ca555e42ff96a071cb9ccb3f437504"),
663+
}
664+
c.Assert(len(refs), Equals, len(expected))
665+
for _, e := range expected {
666+
found := false
667+
for _, r := range refs {
668+
if r.Name() == e.Name() {
669+
found = true
670+
c.Assert(r, DeepEquals, e)
671+
}
676672
}
677-
refsMap[string(rf.Name())] = rf.Hash().String()
673+
c.Assert(found, Equals, true)
678674
}
679-
680-
AssertReferences(c, server, refsMap)
681675
}

0 commit comments

Comments
 (0)