Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions RestSharp.IntegrationTests/AsyncTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,54 @@ public void Handles_GET_Request_Errors_TaskAsync_With_Response_Type()
}
}

[Fact]
public void Can_Timeout_GET_TaskAsync()
{
const string baseUrl = "http://localhost:8080/";
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
{
var client = new RestClient(baseUrl);
var request = new RestRequest("timeout", Method.GET).AddBody("Body_Content");

//Half the value of ResponseHandler.Timeout
request.Timeout = 500;

System.AggregateException agg = Assert.Throws<System.AggregateException>(
delegate
{
var task = client.ExecuteTaskAsync(request);
task.Wait();
});

Assert.IsType(typeof(WebException), agg.InnerException);
Assert.Equal("The request timed-out.", agg.InnerException.Message);
}
}

[Fact]
public void Can_Timeout_PUT_TaskAsync()
{
const string baseUrl = "http://localhost:8080/";
using (SimpleServer.Create(baseUrl, Handlers.Generic<ResponseHandler>()))
{
var client = new RestClient(baseUrl);
var request = new RestRequest("timeout", Method.PUT).AddBody("Body_Content");

//Half the value of ResponseHandler.Timeout
request.Timeout = 500;

System.AggregateException agg = Assert.Throws<System.AggregateException>(
delegate
{
var task = client.ExecuteTaskAsync(request);
task.Wait();
});

Assert.IsType(typeof(WebException), agg.InnerException);
Assert.Equal("The request timed-out.", agg.InnerException.Message);
}
}

void UrlToStatusCodeHandler(HttpListenerContext obj)
{
obj.Response.StatusCode = int.Parse(obj.Request.Url.Segments.Last());
Expand Down
3 changes: 2 additions & 1 deletion RestSharp/Http.Async.cs
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,8 @@ private void RequestStreamCallback(IAsyncResult result, Action<HttpResponse> cal
return;
}

webRequest.BeginGetResponse(r => ResponseCallback(r, callback), webRequest);
IAsyncResult asyncResult = webRequest.BeginGetResponse(r => ResponseCallback(r, callback), webRequest);
SetTimeout(asyncResult, _timeoutState);
}

private void SetTimeout(IAsyncResult asyncResult, TimeOutState timeOutState)
Expand Down