No need to change upload_droplet test anymore because draining flag is now removed

Author: kathap

handlers/upload_droplet/upload_droplet_test.go

@@ -2,14 +2,12 @@ package upload_droplet_test
 
 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"sync"
-	//"sync/atomic"
 	"time"
 
 	"code.cloudfoundry.org/cc-uploader/ccclient/fake_ccclient"
@@ -179,39 +177,12 @@ var _ = Describe("UploadDroplet", func() {
 			})
 		})
 
-		//Context("when the system is draining", func() {
-		//	var dropletUploadHandler http.Handler
-		//	var draining int32
-		//
-		//	BeforeEach(func() {
-		//		// Simulate the system being in a draining state
-		//		atomic.StoreInt32(&draining, 1)
-		//		responseWriter = httptest.NewRecorder()
-		//		var err error
-		//		incomingRequest, err = http.NewRequest("POST", "http://example.com?cc_droplet_upload_uri=http://some-uri", nil)
-		//		Expect(err).NotTo(HaveOccurred())
-		//
-		//		dropletUploadHandler = upload_droplet.New(&uploader, &poller, lager.NewLogger("fake-logger"), &sync.WaitGroup{})
-		//	})
-		//
-		//	//It("returns 503", func() {
-		//	//	dropletUploadHandler.ServeHTTP(outgoingResponse, incomingRequest)
-		//	//	Expect(outgoingResponse.Code).To(Equal(http.StatusServiceUnavailable))
-		//	//	Expect(outgoingResponse.Body.String()).To(ContainSubstring("Service is draining"))
-		//	//})
-		//})
-
 		Context("when the requester (client) goes away", func() {
-			var (
-				cancel             context.CancelFunc
-				ctx                context.Context
-				fakeResponseWriter *test_helpers.FakeResponseWriter
-			)
+			var fakeResponseWriter *test_helpers.FakeResponseWriter
 
 			BeforeEach(func() {
-				ctx, cancel = context.WithCancel(context.Background())
 				var err error
-				incomingRequest, err = http.NewRequestWithContext(ctx,
+				incomingRequest, err = http.NewRequest(
 					"POST",
 					fmt.Sprintf("http://example.com?%s=upload-uri.com", cc_messages.CcDropletUploadUriKey),
 					bytes.NewBufferString(""),
@@ -226,59 +197,34 @@ var _ = Describe("UploadDroplet", func() {
 					responseWriter = fakeResponseWriter
 
 					uploader.UploadStub = func(uploadURL *url.URL, filename string, r *http.Request, cancelChan <-chan struct{}) (*http.Response, error) {
-						// Simulate disconnect
-						go func() {
-							time.Sleep(100 * time.Millisecond)
-							cancel()
-						}()
-
-						Eventually(cancelChan, 2*time.Second).Should(BeClosed())
+						closedChan <- true
+						Eventually(cancelChan).Should(BeClosed())
 						return nil, errors.New("cancelled")
 					}
 				})
 
 				It("responds with an error code", func() {
-					done := make(chan struct{})
-					go func() {
-						dropletUploadHandler := upload_droplet.New(&uploader, &poller, lager.NewLogger("fake-logger"), &sync.WaitGroup{})
-						dropletUploadHandler.ServeHTTP(responseWriter, incomingRequest)
-						close(done)
-					}()
-					Eventually(done, 3*time.Second).Should(BeClosed())
 					Expect(fakeResponseWriter.Code).To(Equal(http.StatusInternalServerError))
 				})
 			})
 
 			Context("and we are polling", func() {
-				var uploadResponse *http.Response
-
 				BeforeEach(func() {
-					uploadResponse = &http.Response{StatusCode: http.StatusOK}
+					uploadResponse := &http.Response{StatusCode: http.StatusOK}
 					uploader.UploadReturns(uploadResponse, nil)
 
 					closedChan := make(chan bool)
 					fakeResponseWriter = test_helpers.NewFakeResponseWriter(closedChan)
 					responseWriter = fakeResponseWriter
 
 					poller.PollStub = func(fallbackURL *url.URL, res *http.Response, cancelChan <-chan struct{}) error {
-						go func() {
-							time.Sleep(100 * time.Millisecond)
-							cancel()
-						}()
-
-						Eventually(cancelChan, 2*time.Second).Should(BeClosed())
+						closedChan <- true
+						Eventually(cancelChan).Should(BeClosed())
 						return errors.New("cancelled")
 					}
 				})
 
 				It("responds with an error code", func() {
-					done := make(chan struct{})
-					go func() {
-						dropletUploadHandler := upload_droplet.New(&uploader, &poller, lager.NewLogger("fake-logger"), &sync.WaitGroup{})
-						dropletUploadHandler.ServeHTTP(responseWriter, incomingRequest)
-						close(done)
-					}()
-					Eventually(done, 3*time.Second).Should(BeClosed())
 					Expect(fakeResponseWriter.Code).To(Equal(http.StatusInternalServerError))
 				})
 			})