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

capability: accept unknown capabilities, fixes #450 #451

Merged
merged 1 commit into from
Jun 24, 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
6 changes: 0 additions & 6 deletions plumbing/protocol/packp/capability/list.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ import (
)

var (
// ErrUnknownCapability is returned if a unknown capability is given
ErrUnknownCapability = errors.New("unknown capability")
// ErrArgumentsRequired is returned if no arguments are giving with a
// capability that requires arguments
ErrArgumentsRequired = errors.New("arguments required")
Expand Down Expand Up @@ -119,10 +117,6 @@ func (l *List) Add(c Capability, values ...string) error {
}

func (l *List) validate(c Capability, values []string) error {
if _, ok := valid[c]; !ok {
return ErrUnknownCapability
}

if requiresArgument[c] && len(values) == 0 {
return ErrArgumentsRequired
}
Expand Down
10 changes: 6 additions & 4 deletions plumbing/protocol/packp/capability/list_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,11 @@ func (s *SuiteCapabilities) TestDecodeWithEqual(c *check.C) {
c.Assert(cap.Get(Agent), check.DeepEquals, []string{"foo=bar"})
}

func (s *SuiteCapabilities) TestDecodeWithErrUnknownCapability(c *check.C) {
func (s *SuiteCapabilities) TestDecodeWithUnknownCapability(c *check.C) {
cap := NewList()
err := cap.Decode([]byte("foo"))
c.Assert(err, check.Equals, ErrUnknownCapability)
c.Assert(err, check.IsNil)
c.Assert(cap.Supports(Capability("foo")), check.Equals, true)
}

func (s *SuiteCapabilities) TestString(c *check.C) {
Expand Down Expand Up @@ -133,10 +134,11 @@ func (s *SuiteCapabilities) TestAdd(c *check.C) {
c.Assert(cap.String(), check.Equals, "symref=foo symref=qux thin-pack")
}

func (s *SuiteCapabilities) TestAddErrUnknownCapability(c *check.C) {
func (s *SuiteCapabilities) TestAddUnknownCapability(c *check.C) {
cap := NewList()
err := cap.Add(Capability("foo"))
c.Assert(err, check.Equals, ErrUnknownCapability)
c.Assert(err, check.IsNil)
c.Assert(cap.Supports(Capability("foo")), check.Equals, true)
}

func (s *SuiteCapabilities) TestAddErrArgumentsRequired(c *check.C) {
Expand Down