Merge pull request #1035 from satnam6502/master

Very minor change to use camelCase for ReasonType as suggested in issue ...
This commit is contained in:
Joe Beda 2014-08-25 17:23:07 -07:00
commit 1118241dec
2 changed files with 6 additions and 3 deletions

View File

@ -436,14 +436,14 @@ const (
// resource.
// "id" string - the identifier of the missing resource
// Status code 404
ReasonTypeNotFound ReasonType = "not_found"
ReasonTypeNotFound ReasonType = "notFound"
// ReasonTypeAlreadyExists means the resource you are creating already exists.
// Details (optional):
// "kind" string - the kind attribute of the conflicting resource
// "id" string - the identifier of the conflicting resource
// Status code 409
ReasonTypeAlreadyExists ReasonType = "already_exists"
ReasonTypeAlreadyExists ReasonType = "alreadyExists"
// ResourceTypeConflict means the requested update operation cannot be completed
// due to a conflict in the operation. The client may need to alter the request.

View File

@ -18,7 +18,10 @@ package apiserver
import (
"errors"
"fmt"
"testing"
"github.com/GoogleCloudPlatform/kubernetes/pkg/api"
)
func TestErrorNew(t *testing.T) {
@ -30,7 +33,7 @@ func TestErrorNew(t *testing.T) {
t.Errorf("expected to not be confict")
}
if IsNotFound(err) {
t.Errorf("expected to not be not_found")
t.Errorf(fmt.Sprintf("expected to not be %s", api.ReasonTypeNotFound))
}
if !IsConflict(NewConflictErr("test", "2", errors.New("message"))) {