Merge pull request #10374 from johncming/deprecated

api/rafthttp: remove deprecated req.Cancel.
2019-01-08 14:33:25 -08:00 · 2019-01-08 14:33:25 -08:00 · 6511829d1f
parent 1e15c7434e 4651f49a5c
commit 6511829d1f
1 changed files with 0 additions and 2 deletions
--- a/etcdserver/api/rafthttp/fake_roundtripper_test.go
+++ b/etcdserver/api/rafthttp/fake_roundtripper_test.go
@ -28,8 +28,6 @@ func (t *roundTripperBlocker) RoundTrip(req *http.Request) (*http.Response, erro
 	select {
 	case <-t.unblockc:
 		return &http.Response{StatusCode: http.StatusNoContent, Body: &nopReadCloser{}}, nil
-	case <-req.Cancel:
-		return nil, errors.New("request canceled")
 	case <-ctx.Done():
 		return nil, errors.New("request canceled")
 	case <-c: