diff options
| author | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
|---|---|---|
| committer | Máximo Cuadros <mcuadros@gmail.com> | 2018-10-15 12:21:23 +0200 |
| commit | 7a77bde9448c15251cdcca14db20b7bf5c798692 (patch) | |
| tree | 4fa875f1fa57b01dcdfdb17d1b3ba2d0519bd493 /plumbing/transport/test/receive_pack.go | |
| parent | 0b7d3fe0a47bd7da9c42ba34b9098441120bda02 (diff) | |
| parent | 345ffd95a2cd1413d7f48280e21a035febbe4e10 (diff) | |
| download | go-git-7a77bde9448c15251cdcca14db20b7bf5c798692.tar.gz | |
Merge branch 'master' of github.com:src-d/go-git into annotated
Diffstat (limited to 'plumbing/transport/test/receive_pack.go')
| -rw-r--r-- | plumbing/transport/test/receive_pack.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plumbing/transport/test/receive_pack.go b/plumbing/transport/test/receive_pack.go index 6179850..5aea1c0 100644 --- a/plumbing/transport/test/receive_pack.go +++ b/plumbing/transport/test/receive_pack.go @@ -231,7 +231,6 @@ func (s *ReceivePackSuite) receivePackNoCheck(c *C, ep *transport.Endpoint, // fixtures are generated with read only permissions, this casuses // errors deleting or modifying files. rootPath := ep.Path - println("STAT", rootPath) stat, err := os.Stat(ep.Path) if rootPath != "" && err == nil && stat.IsDir() { @@ -263,13 +262,16 @@ func (s *ReceivePackSuite) receivePackNoCheck(c *C, ep *transport.Endpoint, req.Packfile = s.emptyPackfile() } - return r.ReceivePack(context.Background(), req) + if s, err := r.ReceivePack(context.Background(), req); err != nil { + return s, err + } else { + return s, err + } } func (s *ReceivePackSuite) receivePack(c *C, ep *transport.Endpoint, req *packp.ReferenceUpdateRequest, fixture *fixtures.Fixture, callAdvertisedReferences bool) { - url := "" if fixture != nil { url = fixture.URL @@ -280,7 +282,6 @@ func (s *ReceivePackSuite) receivePack(c *C, ep *transport.Endpoint, ep.String(), url, callAdvertisedReferences, ) report, err := s.receivePackNoCheck(c, ep, req, fixture, callAdvertisedReferences) - c.Assert(err, IsNil, comment) if req.Capabilities.Supports(capability.ReportStatus) { c.Assert(report, NotNil, comment) |