MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-05-21 09:33:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use verifyError instead of parsResponse, also get rid of mxj dependency

Browse Source
This commit is contained in:
Harshavardhana 2015-04-03 18:55:48 -07:00
parent 321a1a2d36
commit 4b25d4e8db
1 changed files with 6 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pkg/api/api_test.go
View File

@ -18,12 +18,9 @@ package api_test
import ( import (
"bytes" "bytes"
"encoding/xml"
"io" "io"
"io/ioutil" "io/ioutil"
"log" "log"
"net/http"
"net/http/httptest"
"os" "os"
"reflect" "reflect"
"strconv" "strconv"
@ -31,7 +28,10 @@ import (
"testing" "testing"
"time" "time"
"github.com/clbanning/mxj" "encoding/xml"
"net/http"
"net/http/httptest"
"github.com/minio-io/minio/pkg/api" "github.com/minio-io/minio/pkg/api"
"github.com/minio-io/minio/pkg/drivers" "github.com/minio-io/minio/pkg/drivers"
"github.com/minio-io/minio/pkg/drivers/donut" "github.com/minio-io/minio/pkg/drivers/donut"
@ -116,34 +116,6 @@ func (s *MySuite) TearDownTest(c *C) {
s.Root = "" s.Root = ""
} }
/* **** SAMPLE ERROR RESPONSE ****
<?xml version="1.0" encoding="UTF-8"?>
<Error>
<Code>AccessDenied</Code>
<Message>Access Denied</Message>
<Resource>/mybucket/myphoto.jpg</Resource>
<RequestId>F19772218238A85A</RequestId>
<HostId>GuWkjyviSiGHizehqpmsD1ndz5NClSP19DOT+s2mv7gXGQ8/X1lhbDGiIJEXpGFD</HostId>
</Error>
*/
type responseMap struct {
res *http.Response // response headers
resMsg mxj.Map // Keys: Code, Message, Resource, RequestId, HostId
}
// parseResponse returns a new initialized S3.Error structure
func parseResponse(res *http.Response) (*responseMap, error) {
var err error
resp := responseMap{}
resp.res = res
resp.resMsg, err = mxj.NewMapXmlReader(res.Body)
if err != nil {
return nil, err
}
return &resp, nil
}
func (s *MySuite) TestNonExistantObject(c *C) { func (s *MySuite) TestNonExistantObject(c *C) {
switch driver := s.Driver.(type) { switch driver := s.Driver.(type) {
case *mocks.Driver: case *mocks.Driver:
@ -303,13 +275,7 @@ func (s *MySuite) TestMultipleObjects(c *C) {
typedDriver.On("GetObjectMetadata", "bucket", "object", "").Return(drivers.ObjectMetadata{}, drivers.ObjectNotFound{}).Once() typedDriver.On("GetObjectMetadata", "bucket", "object", "").Return(drivers.ObjectMetadata{}, drivers.ObjectNotFound{}).Once()
response, err := http.Get(testServer.URL + "/bucket/object") response, err := http.Get(testServer.URL + "/bucket/object")
c.Assert(err, IsNil) c.Assert(err, IsNil)
responseMap, err := parseResponse(response) verifyError(c, response, "NoSuchKey", "The specified key does not exist.", http.StatusNotFound)
c.Assert(err, IsNil)
c.Assert(responseMap.res.StatusCode, Equals, http.StatusNotFound)
values, err := responseMap.resMsg.ValuesForKey("Code")
c.Assert(err, IsNil)
c.Assert(values[0], Equals, "NoSuchKey")
//// test object 1 //// test object 1
// get object // get object
@ -416,12 +382,7 @@ func (s *MySuite) TestHeader(c *C) {
typedDriver.On("GetObjectMetadata", "bucket", "object", "").Return(drivers.ObjectMetadata{}, drivers.ObjectNotFound{}).Once() typedDriver.On("GetObjectMetadata", "bucket", "object", "").Return(drivers.ObjectMetadata{}, drivers.ObjectNotFound{}).Once()
response, err := http.Get(testServer.URL + "/bucket/object") response, err := http.Get(testServer.URL + "/bucket/object")
c.Assert(err, IsNil) c.Assert(err, IsNil)
responseMap, err := parseResponse(response) verifyError(c, response, "NoSuchKey", "The specified key does not exist.", http.StatusNotFound)
c.Assert(err, IsNil)
c.Assert(responseMap.res.StatusCode, Equals, http.StatusNotFound)
values, err := responseMap.resMsg.ValuesForKey("Code")
c.Assert(err, IsNil)
c.Assert(values[0], Equals, "NoSuchKey")
buffer := bytes.NewBufferString("hello world") buffer := bytes.NewBufferString("hello world")
typedDriver.On("CreateBucket", "bucket").Return(nil).Once() typedDriver.On("CreateBucket", "bucket").Return(nil).Once()