Skip to content

[Tests] Make network tests a bit more resilient #2279

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonpryor merged 1 commit into from
Oct 9, 2018
Merged

[Tests] Make network tests a bit more resilient #2279

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
55 changes: 48 additions & 7 deletions src/Mono.Android/Test/Xamarin.Android.Net/AndroidClientHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@
using System.Net.Http;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Web;

using NUnit.Framework;

Expand Down Expand Up @@ -132,12 +134,32 @@ public void Disposed ()
h.Dispose ();
var c = new HttpClient (h);
try {
c.GetAsync ("http://google.com").Wait ();
var t = ConnectIgnoreFailure (() => c.GetAsync ("http://google.com"), out bool connectionFailed);
if (connectionFailed)
return;

t.Wait ();
Assert.Fail ("#1");
} catch (AggregateException e) {
Assert.IsTrue (e.InnerException is ObjectDisposedException, "#2");
}
}

protected Task<HttpResponseMessage> ConnectIgnoreFailure (Func<Task<HttpResponseMessage>> connector, out bool connectionFailed)
{
connectionFailed = false;
try {
return connector ();
} catch (AggregateException ex) {
if (ex.InnerException is WebException wex && wex.Status == WebExceptionStatus.ConnectFailure) {
connectionFailed = true;
Assert.Ignore ($"Failed to connect to server. {wex}");
return null;
}

throw;
}
}
}

[TestFixture]
Expand Down Expand Up @@ -184,7 +206,10 @@ public void Sanity_Tls_1_2_Url_WithMonoClientHandlerFails ()
var supportTls1_2 = tlsProvider.Equals ("btls", StringComparison.OrdinalIgnoreCase);
using (var c = new HttpClient (new HttpClientHandler ())) {
try {
var tr = c.GetAsync (Tls_1_2_Url);
var tr = ConnectIgnoreFailure (() => c.GetAsync (Tls_1_2_Url), out bool connectionFailed);
if (connectionFailed)
return;

tr.Wait ();
tr.Result.EnsureSuccessStatusCode ();
if (!supportTls1_2) {
Expand All @@ -210,7 +235,10 @@ public void Cancel_Client_Works()
var cts = new CancellationTokenSource ();
cts.Cancel (); //Cancel immediately
using (var c = new HttpClient (CreateHandler())) {
var tr = c.GetAsync ("http://10.255.255.1", cts.Token);
var tr = ConnectIgnoreFailure (() => c.GetAsync ("http://10.255.255.1", cts.Token), out bool connectionFailed);
if (connectionFailed)
return;

try {
tr.Wait();
Assert.Fail ("SHOULD NOT HAPPEN: Request is expected to cancel");
Expand All @@ -227,7 +255,10 @@ public void Token_Timeout_Works()
{
var cts = new CancellationTokenSource (2000); //Cancel after 2000ms through token
using (var c = new HttpClient (CreateHandler())){
var tr = c.GetAsync ("http://10.255.255.1", cts.Token);
var tr = ConnectIgnoreFailure (() => c.GetAsync ("http://10.255.255.1", cts.Token), out bool connectionFailed);
if (connectionFailed)
return;

try {
tr.Wait ();
Assert.Fail ("SHOULD NOT HAPPEN: Request is expected to cancel");
Expand All @@ -245,7 +276,10 @@ public void Property_Timeout_Works()
using (var c = new HttpClient (CreateHandler ()))
{
c.Timeout = TimeSpan.FromMilliseconds (2000); //Cancel after 2000ms through Timeout property
var tr = c.GetAsync ("http://10.255.255.1");
var tr = ConnectIgnoreFailure (() => c.GetAsync ("http://10.255.255.1"), out bool connectionFailed);
if (connectionFailed)
return;

try {
tr.Wait ();
Assert.Fail ("SHOULD NOT HAPPEN: Request is expected to cancel");
Expand All @@ -263,7 +297,10 @@ public void Redirect_Without_Protocol_Works()
var requestURI = new Uri ("http://tls-test.internalx.com/redirect.php");
var redirectedURI = new Uri ("http://tls-test.internalx.com/redirect-301.html");
using (var c = new HttpClient (CreateHandler ())) {
var tr = c.GetAsync (requestURI);
var tr = ConnectIgnoreFailure (() => c.GetAsync (requestURI), out bool connectionFailed);
if (connectionFailed)
return;

tr.Wait ();
tr.Result.EnsureSuccessStatusCode ();
Assert.AreEqual (redirectedURI, tr.Result.RequestMessage.RequestUri, "Invalid redirected URI");
Expand All @@ -278,7 +315,11 @@ public void Redirect_POST_With_Content_Works ()
using (var c = new HttpClient (CreateHandler ())) {
var request = new HttpRequestMessage (HttpMethod.Post, requestURI);
request.Content = new StringContent("{}", Encoding.UTF8, "application/json");
var response = c.SendAsync(request).Result;
var t = ConnectIgnoreFailure (() => c.SendAsync(request), out bool connectionFailed);
if (connectionFailed)
return;

var response = t.Result;
response.EnsureSuccessStatusCode ();
Assert.AreEqual (redirectedURI, response.RequestMessage.RequestUri, "Invalid redirected URI");
}
Expand Down