oyd
/
minio
6
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

misspell fixes. (#2835)

Browse Source
master
Karthic Rao 8 years ago committed by Harshavardhana
parent 73b50aea2d
commit 6a9013b97c
6 changed files with 23 additions and 23 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      cmd/event-notifier_test.go
  2. 4
      cmd/fs-v1.go
  3. 4
      cmd/object-api-getobject_test.go
  4. 30
      cmd/object-handlers_test.go
  5. 4
      cmd/server_test.go
  6. 2
      cmd/signature-v2.go

2
cmd/event-notifier_test.go
Unescape View File

@ -372,7 +372,7 @@ func TestListenBucketNotification(t *testing.T) {
case n := <-nEventCh: case n := <-nEventCh:
// Check that received event // Check that received event
if len(n) == 0 { if len(n) == 0 {
t.Fatal("Unexpected error occured") t.Fatal("Unexpected error occurred")
} }
if n[0].S3.Object.Key != objectName { if n[0].S3.Object.Key != objectName {
t.Fatalf("Received wrong object name in notification, expected %s, received %s", n[0].S3.Object.Key, objectName) t.Fatalf("Received wrong object name in notification, expected %s, received %s", n[0].S3.Object.Key, objectName)

4
cmd/fs-v1.go
Unescape View File

@ -125,14 +125,14 @@ func (fs fsObjects) Shutdown() error {
_, err := fs.storage.ListDir(minioMetaBucket, mpartMetaPrefix) _, err := fs.storage.ListDir(minioMetaBucket, mpartMetaPrefix)
if err != errFileNotFound { if err != errFileNotFound {
// A nil err means that multipart directory is not empty hence do not remove '.minio.sys' volume. // A nil err means that multipart directory is not empty hence do not remove '.minio.sys' volume.
// A non nil err means that an unexpected error occured // A non nil err means that an unexpected error occurred
return toObjectErr(traceError(err)) return toObjectErr(traceError(err))
} }
// List if there are any bucket configuration entries. // List if there are any bucket configuration entries.
_, err = fs.storage.ListDir(minioMetaBucket, bucketConfigPrefix) _, err = fs.storage.ListDir(minioMetaBucket, bucketConfigPrefix)
if err != errFileNotFound { if err != errFileNotFound {
// A nil err means that bucket config directory is not empty hence do not remove '.minio.sys' volume. // A nil err means that bucket config directory is not empty hence do not remove '.minio.sys' volume.
// A non nil err means that an unexpected error occured // A non nil err means that an unexpected error occurred
return toObjectErr(traceError(err)) return toObjectErr(traceError(err))
} }
// Cleanup everything else. // Cleanup everything else.

4
cmd/object-api-getobject_test.go
Unescape View File

@ -42,7 +42,7 @@ func testGetObject(obj ObjectLayer, instanceType string, t TestErrHandler) {
} }
// set of byte data for PutObject. // set of byte data for PutObject.
// object has to be inserted before running tests for GetObject. // object has to be created before running tests for GetObject.
// this is required even to assert the GetObject data, // this is required even to assert the GetObject data,
// since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical. // since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical.
bytesData := []struct { bytesData := []struct {
@ -194,7 +194,7 @@ func testGetObjectDiskNotFound(obj ObjectLayer, instanceType string, disks []str
} }
// set of byte data for PutObject. // set of byte data for PutObject.
// object has to be inserted before running tests for GetObject. // object has to be created before running tests for GetObject.
// this is required even to assert the GetObject data, // this is required even to assert the GetObject data,
// since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical. // since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical.
bytesData := []struct { bytesData := []struct {

30
cmd/object-handlers_test.go
Unescape View File

@ -46,15 +46,15 @@ const (
) )
// Wrapper for calling GetObject API handler tests for both XL multiple disks and FS single drive setup. // Wrapper for calling GetObject API handler tests for both XL multiple disks and FS single drive setup.
func TestAPIGetOjectHandler(t *testing.T) { func TestAPIGetObjectHandler(t *testing.T) {
ExecObjectLayerAPITest(t, testAPIGetOjectHandler, []string{"GetObject"}) ExecObjectLayerAPITest(t, testAPIGetObjectHandler, []string{"GetObject"})
} }
func testAPIGetOjectHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler, func testAPIGetObjectHandler(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler,
credentials credential, t TestErrHandler) { credentials credential, t TestErrHandler) {
objectName := "test-object" objectName := "test-object"
// set of byte data for PutObject. // set of byte data for PutObject.
// object has to be inserted before running tests for GetObject. // object has to be created before running tests for GetObject.
// this is required even to assert the GetObject data, // this is required even to assert the GetObject data,
// since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical. // since dataInserted === dataFetched back is a primary criteria for any object storage this assertion is critical.
bytesData := []struct { bytesData := []struct {
@ -166,7 +166,7 @@ func testAPIGetOjectHandler(obj ObjectLayer, instanceType, bucketName string, ap
if err != nil { if err != nil {
t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err) t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
} }
// Verify whether the bucket obtained object is same as the one inserted. // Verify whether the bucket obtained object is same as the one created.
if !bytes.Equal(testCase.expectedContent, actualContent) { if !bytes.Equal(testCase.expectedContent, actualContent) {
t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent)) t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent))
} }
@ -303,7 +303,7 @@ func testAPIPutObjectStreamSigV4Handler(obj ObjectLayer, instanceType, bucketNam
t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err) t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
} }
if testCase.shouldPass { if testCase.shouldPass {
// Verify whether the bucket obtained object is same as the one inserted. // Verify whether the bucket obtained object is same as the one created.
if !bytes.Equal(testCase.expectedContent, actualContent) { if !bytes.Equal(testCase.expectedContent, actualContent) {
t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent)) t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent))
} }
@ -376,7 +376,7 @@ func testAPIPutObjectHandler(obj ObjectLayer, instanceType, bucketName string, a
if err != nil { if err != nil {
t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err) t.Fatalf("Test %d: %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
} }
// Verify whether the bucket obtained object is same as the one inserted. // Verify whether the bucket obtained object is same as the one created.
if !bytes.Equal(testCase.expectedContent, actualContent) { if !bytes.Equal(testCase.expectedContent, actualContent) {
t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent)) t.Errorf("Test %d: %s: Object content differs from expected value.: %s", i+1, instanceType, string(actualContent))
} }
@ -409,7 +409,7 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
} }
// set of byte data for PutObject. // set of byte data for PutObject.
// object has to be inserted before running tests for Copy Object. // object has to be created before running tests for Copy Object.
// this is required even to assert the copied object, // this is required even to assert the copied object,
bytesData := []struct { bytesData := []struct {
byteData []byte byteData []byte
@ -536,7 +536,7 @@ func testAPICopyObjectHandler(obj ObjectLayer, instanceType, bucketName string,
// Wrapper for calling NewMultipartUpload tests for both XL multiple disks and single node setup. // Wrapper for calling NewMultipartUpload tests for both XL multiple disks and single node setup.
// First register the HTTP handler for NewMutlipartUpload, then a HTTP request for NewMultipart upload is made. // First register the HTTP handler for NewMutlipartUpload, then a HTTP request for NewMultipart upload is made.
// The UploadID from the response body is parsed and its existance is asserted with an attempt to ListParts using it. // The UploadID from the response body is parsed and its existence is asserted with an attempt to ListParts using it.
func TestAPINewMultipartHandler(t *testing.T) { func TestAPINewMultipartHandler(t *testing.T) {
ExecObjectLayerAPITest(t, testAPINewMultipartHandler, []string{"NewMultipart"}) ExecObjectLayerAPITest(t, testAPINewMultipartHandler, []string{"NewMultipart"})
} }
@ -577,7 +577,7 @@ func testAPINewMultipartHandler(obj ObjectLayer, instanceType, bucketName string
// Wrapper for calling NewMultipartUploadParallel tests for both XL multiple disks and single node setup. // Wrapper for calling NewMultipartUploadParallel tests for both XL multiple disks and single node setup.
// The objective of the test is to initialte multipart upload on the same object 10 times concurrently, // The objective of the test is to initialte multipart upload on the same object 10 times concurrently,
// The UploadID from the response body is parsed and its existance is asserted with an attempt to ListParts using it. // The UploadID from the response body is parsed and its existence is asserted with an attempt to ListParts using it.
func TestAPINewMultipartHandlerParallel(t *testing.T) { func TestAPINewMultipartHandlerParallel(t *testing.T) {
ExecObjectLayerAPITest(t, testAPINewMultipartHandlerParallel, []string{"NewMultipart"}) ExecObjectLayerAPITest(t, testAPINewMultipartHandlerParallel, []string{"NewMultipart"})
} }
@ -636,7 +636,7 @@ func testAPINewMultipartHandlerParallel(obj ObjectLayer, instanceType, bucketNam
} }
} }
// The UploadID from the response body is parsed and its existance is asserted with an attempt to ListParts using it. // The UploadID from the response body is parsed and its existence is asserted with an attempt to ListParts using it.
func TestAPICompleteMultipartHandler(t *testing.T) { func TestAPICompleteMultipartHandler(t *testing.T) {
ExecObjectLayerAPITest(t, testAPICompleteMultipartHandler, []string{"CompleteMultipart"}) ExecObjectLayerAPITest(t, testAPICompleteMultipartHandler, []string{"CompleteMultipart"})
} }
@ -737,7 +737,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s
}, },
}, },
} }
// on succesfull complete multipart operation the s3MD5 for the parts uploaded iwll be returned. // on succesfull complete multipart operation the s3MD5 for the parts uploaded will be returned.
s3MD5, err := completeMultipartMD5(inputParts[3].parts...) s3MD5, err := completeMultipartMD5(inputParts[3].parts...)
if err != nil { if err != nil {
t.Fatalf("Obtaining S3MD5 failed") t.Fatalf("Obtaining S3MD5 failed")
@ -779,7 +779,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s
expectedRespStatus: http.StatusBadRequest, expectedRespStatus: http.StatusBadRequest,
}, },
// Test case - 3. // Test case - 3.
// Non-Existant uploadID. // Non-Existent uploadID.
// 404 Not Found response status expected. // 404 Not Found response status expected.
{ {
bucket: bucketName, bucket: bucketName,
@ -867,7 +867,7 @@ func testAPICompleteMultipartHandler(obj ObjectLayer, instanceType, bucketName s
if err != nil { if err != nil {
t.Fatalf("Test %d : Minio %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err) t.Fatalf("Test %d : Minio %s: Failed parsing response body: <ERROR> %v", i+1, instanceType, err)
} }
// Verify whether the bucket obtained object is same as the one inserted. // Verify whether the bucket obtained object is same as the one created.
if !bytes.Equal(testCase.expectedContent, actualContent) { if !bytes.Equal(testCase.expectedContent, actualContent) {
t.Errorf("Test %d : Minio %s: Object content differs from expected value.", i+1, instanceType) t.Errorf("Test %d : Minio %s: Object content differs from expected value.", i+1, instanceType)
} }
@ -888,7 +888,7 @@ func testAPIDeleteOjectHandler(obj ObjectLayer, instanceType, bucketName string,
} }
objectName := "test-object" objectName := "test-object"
// set of byte data for PutObject. // set of byte data for PutObject.
// object has to be inserted before running tests for Deleting the object. // object has to be created before running tests for Deleting the object.
bytesData := []struct { bytesData := []struct {
byteData []byte byteData []byte
}{ }{

4
cmd/server_test.go
Unescape View File

@ -914,7 +914,7 @@ func (s *TestSuiteCommon) TestPutBucket(c *C) {
// The following is the test flow. // The following is the test flow.
// 1. Create bucket. // 1. Create bucket.
// 2. Insert Object. // 2. Insert Object.
// 3. Use "X-Amz-Copy-Source" header to copy the previously inserted object. // 3. Use "X-Amz-Copy-Source" header to copy the previously created object.
// 4. Validate the content of copied object. // 4. Validate the content of copied object.
func (s *TestSuiteCommon) TestCopyObject(c *C) { func (s *TestSuiteCommon) TestCopyObject(c *C) {
// generate a random bucket name. // generate a random bucket name.
@ -930,7 +930,7 @@ func (s *TestSuiteCommon) TestCopyObject(c *C) {
c.Assert(err, IsNil) c.Assert(err, IsNil)
c.Assert(response.StatusCode, Equals, http.StatusOK) c.Assert(response.StatusCode, Equals, http.StatusOK)
// content for the object to be inserted. // content for the object to be created.
buffer1 := bytes.NewReader([]byte("hello world")) buffer1 := bytes.NewReader([]byte("hello world"))
objectName := "testObject" objectName := "testObject"
// create HTTP request for object upload. // create HTTP request for object upload.

2
cmd/signature-v2.go
Unescape View File

@ -69,7 +69,7 @@ func doesPresignV2SignatureMatch(r *http.Request) APIErrorCode {
return ErrExpiredPresignRequest return ErrExpiredPresignRequest
} }
// Save incoming siganture to be validated later. // Save incoming signature to be validated later.
incomingSignature := req.URL.Query().Get("Signature") incomingSignature := req.URL.Query().Get("Signature")
// Set the expires header for string to sign. // Set the expires header for string to sign.

Write Preview
Loading…
Cancel
Save