Imported Upstream version 4.6.0.125

Former-commit-id: a2155e9bd80020e49e72e86c44da02a8ac0e57a4
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-08-03 10:59:49 +00:00
parent a569aebcfd
commit e79aa3c0ed
17047 changed files with 3137615 additions and 392334 deletions

View File

@ -106,11 +106,11 @@ namespace MonoTests.System.Net.Sockets
bool res = clientSocket.SendAsync (e);
if (res) {
if (!m.WaitOne (1500))
throw new TimeoutException ();
Assert.Fail ("Timeout #1");
}
if (!mainEvent.WaitOne (1500))
throw new TimeoutException ();
Assert.Fail ("Timeout #2");
if (error != null)
throw error;
@ -124,13 +124,13 @@ namespace MonoTests.System.Net.Sockets
res = clientSocket.SendAsync (e);
if (res) {
if (!m.WaitOne (1500))
throw new TimeoutException ();
Assert.Fail ("Timeout #3");
}
if (!mainEvent.WaitOne (1500))
throw new TimeoutException ();
Assert.Fail ("Timeout #4");
if (error != null)
throw error;
}
}
}
}