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

transport/server: use Endpoint string representation as a map key. #394

Merged
merged 1 commit into from
May 16, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plumbing/transport/server/loader.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,13 @@ func (l *fsLoader) Load(ep transport.Endpoint) (storer.Storer, error) {

// MapLoader is a Loader that uses a lookup map of storer.Storer by
// transport.Endpoint.
type MapLoader map[transport.Endpoint]storer.Storer
type MapLoader map[string]storer.Storer

// Load returns a storer.Storer for given a transport.Endpoint by looking it up
// in the map. Returns transport.ErrRepositoryNotFound if the endpoint does not
// exist.
func (l MapLoader) Load(ep transport.Endpoint) (storer.Storer, error) {
s, ok := l[ep]
s, ok := l[ep.String()]
if !ok {
return nil, transport.ErrRepositoryNotFound
}
Expand Down
16 changes: 16 additions & 0 deletions plumbing/transport/server/loader_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import (
"path/filepath"

"gopkg.in/src-d/go-git.v4/plumbing/transport"
"gopkg.in/src-d/go-git.v4/storage/memory"

. "gopkg.in/check.v1"
)
Expand Down Expand Up @@ -54,3 +55,18 @@ func (s *LoaderSuite) TestLoadIgnoreHost(c *C) {
c.Assert(err, IsNil)
c.Assert(sto, NotNil)
}

func (s *LoaderSuite) TestMapLoader(c *C) {
ep, err := transport.NewEndpoint("file://test")
sto := memory.NewStorage()
c.Assert(err, IsNil)

loader := MapLoader{ep.String(): sto}

ep, err = transport.NewEndpoint("file://test")
c.Assert(err, IsNil)

loaderSto, err := loader.Load(ep)
c.Assert(err, IsNil)
c.Assert(sto, Equals, loaderSto)
}
4 changes: 2 additions & 2 deletions plumbing/transport/server/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ func (s *BaseSuite) prepareRepositories(c *C, basic *transport.Endpoint,
*basic = ep
sto, err := filesystem.NewStorage(fs)
c.Assert(err, IsNil)
s.loader[ep] = sto
s.loader[ep.String()] = sto

path = "/empty.git"
url = fmt.Sprintf("%s://%s", inprocScheme, path)
ep, err = transport.NewEndpoint(url)
c.Assert(err, IsNil)
*empty = ep
s.loader[ep] = memory.NewStorage()
s.loader[ep.String()] = memory.NewStorage()

path = "/non-existent.git"
url = fmt.Sprintf("%s://%s", inprocScheme, path)
Expand Down