Imported Upstream version 3.12.0

Former-commit-id: cf92446697332992ec36726e78eb8703e1f259d7
This commit is contained in:
Jo Shields
2015-01-13 10:44:36 +00:00
parent 8b9b85e7f5
commit 181b81b4a4
659 changed files with 12743 additions and 16300 deletions

View File

@ -49,7 +49,10 @@ namespace MonoTests.System.Net.WebSockets
[Test]
public void ServerHandshakeReturnCrapStatusCodeTest ()
{
// On purpose,
#pragma warning disable 4014
HandleHttpRequestAsync ((req, resp) => resp.StatusCode = 418);
#pragma warning restore 4014
try {
Assert.IsTrue (socket.ConnectAsync (new Uri ("ws://localhost:" + Port), CancellationToken.None).Wait (5000));
} catch (AggregateException e) {
@ -62,10 +65,12 @@ namespace MonoTests.System.Net.WebSockets
[Test]
public void ServerHandshakeReturnWrongUpgradeHeader ()
{
#pragma warning disable 4014
HandleHttpRequestAsync ((req, resp) => {
resp.StatusCode = 101;
resp.Headers["Upgrade"] = "gtfo";
});
#pragma warning restore 4014
try {
Assert.IsTrue (socket.ConnectAsync (new Uri ("ws://localhost:" + Port), CancellationToken.None).Wait (5000));
} catch (AggregateException e) {
@ -78,12 +83,14 @@ namespace MonoTests.System.Net.WebSockets
[Test]
public void ServerHandshakeReturnWrongConnectionHeader ()
{
#pragma warning disable 4014
HandleHttpRequestAsync ((req, resp) => {
resp.StatusCode = 101;
resp.Headers["Upgrade"] = "websocket";
// Mono http request doesn't like the forcing, test still valid since the default connection header value is empty
//ForceSetHeader (resp.Headers, "Connection", "Foo");
});
#pragma warning restore 4014
try {
Assert.IsTrue (socket.ConnectAsync (new Uri ("ws://localhost:" + Port), CancellationToken.None).Wait (5000));
} catch (AggregateException e) {
@ -94,6 +101,7 @@ namespace MonoTests.System.Net.WebSockets
}
[Test]
[Ignore ("See bug #24340")]
public void EchoTest ()
{
const string Payload = "This is a websocket test";
@ -118,6 +126,7 @@ namespace MonoTests.System.Net.WebSockets
}
[Test]
[Ignore ("See bug #24340")]
public void CloseOutputAsyncTest ()
{
Assert.IsTrue (socket.ConnectAsync (new Uri (EchoServerUrl), CancellationToken.None).Wait (5000));