fix windows test

Author: garethgeorge

funcframework/framework.go

@@ -398,7 +398,7 @@ func writeHTTPErrorResponse(w http.ResponseWriter, statusCode int, status, msg s
 	fmt.Fprint(w, msg)
 }
 
-// addTImeoutToRequestContext replaces the request's context with a cancellation if requested
+// setContextTimeoutIfRequested replaces the request's context with a cancellation if requested
 func setContextTimeoutIfRequested(r *http.Request) (*http.Request, func()) {
 	timeoutStr := os.Getenv("CLOUD_RUN_TIMEOUT_SECONDS")
 	if timeoutStr == "" {

funcframework/framework_test.go

@@ -1001,7 +1001,6 @@ func TestHTTPRequestTimeout(t *testing.T) {
 	timeoutEnvVar := "CLOUD_RUN_TIMEOUT_SECONDS"
 	prev := os.Getenv(timeoutEnvVar)
 	defer os.Setenv(timeoutEnvVar, prev)
-	defer cleanup()
 
 	cloudeventsJSON := []byte(`{
 		"specversion" : "1.0",
@@ -1034,7 +1033,7 @@ func TestHTTPRequestTimeout(t *testing.T) {
 			timeout:      "aaa",
 		},
 		{
-			name:         "zero deadline",
+			name:         "expired deadline",
 			wantDeadline: true,
 			wantExpired:  true,
 			timeout:      "0",
@@ -1091,11 +1090,11 @@ func TestHTTPRequestTimeout(t *testing.T) {
 					t.Fatalf("failed to create request")
 				}
 				req.Header.Add("Content-Type", "application/cloudevents+json")
-				_, err = (&http.Client{}).Do(req)
+				client := &http.Client{}
+				_, err = client.Do(req)
 				if err != nil {
 					t.Fatalf("request failed")
 				}
-
 				if ceReqCtx == nil {
 					t.Fatalf("expected non-nil request context")
 				}