diff --git a/cmd/admin-handlers_test.go b/cmd/admin-handlers_test.go index 74c984f02..cc43ef582 100644 --- a/cmd/admin-handlers_test.go +++ b/cmd/admin-handlers_test.go @@ -960,81 +960,3 @@ func collectHealResults(t *testing.T, adminTestBed *adminXLTestBed, bucket, return res } - -func TestHealStartNStatusHandler(t *testing.T) { - adminTestBed, err := prepareAdminXLTestBed() - if err != nil { - t.Fatal("Failed to initialize a single node XL backend for admin handler tests.") - } - defer adminTestBed.TearDown() - - // gen. test data - adminTestBed.GenerateHealTestData(t) - defer adminTestBed.CleanupHealTestData(t) - - // Prepare heal-start request to send to the server. - healOpts := madmin.HealOpts{ - Recursive: true, - DryRun: false, - } - bucketName, objName := "mybucket", "myobject-0" - var hss madmin.HealStartSuccess - - { - req := mkHealStartReq(t, bucketName, objName, healOpts) - rec := httptest.NewRecorder() - adminTestBed.router.ServeHTTP(rec, req) - if http.StatusOK != rec.Code { - t.Errorf("Unexpected status code - got %d but expected %d", - rec.Code, http.StatusOK) - } - - err = json.Unmarshal(rec.Body.Bytes(), &hss) - if err != nil { - t.Fatal("unable to unmarshal response") - } - - if hss.ClientToken == "" { - t.Errorf("unexpected result") - } - } - - { - // test with an invalid client token - req := mkHealStatusReq(t, bucketName, objName, hss.ClientToken+hss.ClientToken) - rec := httptest.NewRecorder() - adminTestBed.router.ServeHTTP(rec, req) - if rec.Code != http.StatusBadRequest { - t.Errorf("Unexpected status code") - } - } - - { - // fetch heal status - results := collectHealResults(t, adminTestBed, bucketName, - objName, hss.ClientToken, 5) - - // check if we got back an expected record - foundIt := false - for _, item := range results.Items { - if item.Type == madmin.HealItemObject && - item.Bucket == bucketName && item.Object == objName { - foundIt = true - } - } - if !foundIt { - t.Error("did not find expected heal record in heal results") - } - - // check that the heal settings in the results is the - // same as what we started the heal seq. with. - if results.HealSettings != healOpts { - t.Errorf("unexpected heal settings: %v", - results.HealSettings) - } - - if results.Summary == healStoppedStatus { - t.Errorf("heal sequence stopped unexpectedly") - } - } -} diff --git a/cmd/object-handlers_test.go b/cmd/object-handlers_test.go index b6902fb2d..02e9e17ba 100644 --- a/cmd/object-handlers_test.go +++ b/cmd/object-handlers_test.go @@ -1738,7 +1738,6 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri for i, testCase := range testCases { var req *http.Request - var reqV2 *http.Request // initialize HTTP NewRecorder, this records any mutations to response writer inside the handler. rec := httptest.NewRecorder() if !testCase.invalidPartNumber || !testCase.maximumPartNumber { @@ -1782,37 +1781,6 @@ func testAPICopyObjectPartHandler(obj ObjectLayer, instanceType, bucketName stri t.Fatalf("Test %d: %s: Expected only one entry returned %d entries", i+1, instanceType, len(results.Parts)) } } - - // Verify response of the V2 signed HTTP request. - // initialize HTTP NewRecorder, this records any mutations to response writer inside the handler. - recV2 := httptest.NewRecorder() - - reqV2, err = newTestRequest("PUT", getCopyObjectPartURL("", testCase.bucketName, testObject, testCase.uploadID, "1"), 0, nil) - if err != nil { - t.Fatalf("Test %d: Failed to create HTTP request for copy Object: %v", i+1, err) - } - // "X-Amz-Copy-Source" header contains the information about the source bucket and the object to copied. - if testCase.copySourceHeader != "" { - reqV2.Header.Set("X-Amz-Copy-Source", testCase.copySourceHeader) - } - if testCase.copySourceVersionID != "" { - reqV2.Header.Set("X-Amz-Copy-Source-Version-Id", testCase.copySourceVersionID) - } - if testCase.copySourceRange != "" { - reqV2.Header.Set("X-Amz-Copy-Source-Range", testCase.copySourceRange) - } - - err = signRequestV2(reqV2, testCase.accessKey, testCase.secretKey) - if err != nil { - t.Fatalf("Failed to V2 Sign the HTTP request: %v.", err) - } - - // Since `apiRouter` satisfies `http.Handler` it has a ServeHTTP to execute the logic of the handler. - // Call the ServeHTTP to execute the handler. - apiRouter.ServeHTTP(recV2, reqV2) - if recV2.Code != testCase.expectedRespStatus { - t.Errorf("Test %d: %s: Expected the response status to be `%d`, but instead found `%d`", i+1, instanceType, testCase.expectedRespStatus, recV2.Code) - } } // HTTP request for testing when `ObjectLayer` is set to `nil`. @@ -3189,73 +3157,6 @@ func testAPIDeleteObjectHandler(obj ObjectLayer, instanceType, bucketName string ExecObjectLayerAPINilTest(t, nilBucket, nilObject, instanceType, apiRouter, nilReq) } -// TestAPIPutObjectPartHandlerPreSign - Tests validate the response of PutObjectPart HTTP handler -// when the request signature type is PreSign. -func TestAPIPutObjectPartHandlerPreSign(t *testing.T) { - defer DetectTestLeak(t)() - ExecObjectLayerAPITest(t, testAPIPutObjectPartHandlerPreSign, []string{"NewMultipart", "PutObjectPart"}) -} - -func testAPIPutObjectPartHandlerPreSign(obj ObjectLayer, instanceType, bucketName string, apiRouter http.Handler, - credentials auth.Credentials, t *testing.T) { - testObject := "testobject" - rec := httptest.NewRecorder() - req, err := newTestSignedRequestV4("POST", getNewMultipartURL("", bucketName, "testobject"), - 0, nil, credentials.AccessKey, credentials.SecretKey, nil) - if err != nil { - t.Fatalf("[%s] - Failed to create a signed request to initiate multipart upload for %s/%s: %v", - instanceType, bucketName, testObject, err) - } - apiRouter.ServeHTTP(rec, req) - - // Get uploadID of the mulitpart upload initiated. - var mpartResp InitiateMultipartUploadResponse - mpartRespBytes, err := ioutil.ReadAll(rec.Result().Body) - if err != nil { - t.Fatalf("[%s] Failed to read NewMultipartUpload response %v", instanceType, err) - - } - err = xml.Unmarshal(mpartRespBytes, &mpartResp) - if err != nil { - t.Fatalf("[%s] Failed to unmarshal NewMultipartUpload response %v", instanceType, err) - } - - rec = httptest.NewRecorder() - req, err = newTestRequest("PUT", getPutObjectPartURL("", bucketName, testObject, mpartResp.UploadID, "1"), - int64(len("hello")), bytes.NewReader([]byte("hello"))) - if err != nil { - t.Fatalf("[%s] - Failed to create an unsigned request to put object part for %s/%s %v", - instanceType, bucketName, testObject, err) - } - - err = preSignV2(req, credentials.AccessKey, credentials.SecretKey, int64(10*60*60)) - if err != nil { - t.Fatalf("[%s] - Failed to presign an unsigned request to put object part for %s/%s %v", - instanceType, bucketName, testObject, err) - } - apiRouter.ServeHTTP(rec, req) - if rec.Code != http.StatusOK { - t.Errorf("Test %d %s expected to succeed but failed with HTTP status code %d", 1, instanceType, rec.Code) - } - - rec = httptest.NewRecorder() - req, err = newTestRequest("PUT", getPutObjectPartURL("", bucketName, testObject, mpartResp.UploadID, "1"), - int64(len("hello")), bytes.NewReader([]byte("hello"))) - if err != nil { - t.Fatalf("[%s] - Failed to create an unsigned request to put object part for %s/%s %v", - instanceType, bucketName, testObject, err) - } - err = preSignV4(req, credentials.AccessKey, credentials.SecretKey, int64(10*60*60)) - if err != nil { - t.Fatalf("[%s] - Failed to presign an unsigned request to put object part for %s/%s %v", - instanceType, bucketName, testObject, err) - } - apiRouter.ServeHTTP(rec, req) - if rec.Code != http.StatusOK { - t.Errorf("Test %d %s expected to succeed but failed with HTTP status code %d", 1, instanceType, rec.Code) - } -} - // TestAPIPutObjectPartHandlerStreaming - Tests validate the response of PutObjectPart HTTP handler // when the request signature type is `streaming signature`. func TestAPIPutObjectPartHandlerStreaming(t *testing.T) {