Merge pull request #3229 from xiang90/f_cerr

client: return context.Canceled error when user cancels the request
2015-08-06 14:41:19 -07:00
parent 25ad71fbac f38187bbdb
commit b04bb3e0ea
2 changed files with 8 additions and 2 deletions
--- a/client/client_test.go
+++ b/client/client_test.go
@ -364,7 +364,7 @@ func TestHTTPClusterClientDo(t *testing.T) {
 				),
 				rand: rand.New(rand.NewSource(0)),
 			},
-			wantErr: &ClusterError{Errors: []error{context.Canceled}},
+			wantErr: context.Canceled,
 		},

 		// return err if there are no endpoints