Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-04-10 11:41:01 +00:00
parent 1190d13a04
commit 6bdd276d05
19939 changed files with 3099680 additions and 93811 deletions

View File

@@ -91,8 +91,11 @@ namespace MonoTests.Helpers
listenSocket = tcpListener.AcceptSocket ();
listenSocket.Send (requestHandler (listenSocket));
try {
listenSocket.Shutdown (SocketShutdown.Receive);
// On Windows a Receive() is needed here before Shutdown() to consume the data some tests send.
listenSocket.ReceiveTimeout = 10 * 1000;
listenSocket.Receive (new byte [0]);
listenSocket.Shutdown (SocketShutdown.Send);
listenSocket.Shutdown (SocketShutdown.Receive);
} catch {
}
} catch (SocketException ex) {