Return context.Err() if context is aborted

taskcluster · Apr 10, 2018 · 80add6c · 80add6c
1 parent 2965059
commit 80add6c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/http.go b/http.go
@@ -213,6 +213,10 @@ func (client *Client) APICall(payload interface{}, method, route string, result
 	callSummary, err := client.Request(rawPayload, method, route, query)
 	callSummary.HTTPRequestObject = payload
 	if err != nil {
+		// If context failed during this request, then we should just return that error
+		if client.Context != nil && client.Context.Err() != nil {
+			return result, callSummary, client.Context.Err()
+		}
 		return result,
 			callSummary,
 			&APICallException{

diff --git a/http_test.go b/http_test.go
@@ -201,13 +201,8 @@ func TestRequestWithContext(t *testing.T) {
 	if err == nil {
 		t.Fatal("Should have had a cancel error")
 	}
-	switch e := err.(type) {
-	case *APICallException:
-		if e.RootCause != context.Canceled {
-			t.Fatalf("Expected canceled error but got %T %v", e, e)
-		}
-	default:
-		t.Fatalf("Was expecting a *tcclient.APICallException but got %T %v", e, e)
+	if err != context.Canceled {
+		t.Fatalf("Expected canceled error but got %T %v", err, err)
 	}
 }