tk/Ocelot
1
0
Fork 0
mirror of https://github.com/nsnail/Ocelot.git synced 2025-06-19 05:28:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feature/#295 consul acl (#307)

Browse Source 
* removed file

* updated package

* updated package

* updated package

* updated package

* updated package

* updated package

* updated package

* all packages updated

* #295 can add token to service provider config and this will be used by consul clients to get services and configuration

* #295 wait longer for this test
This commit is contained in:
Tom Pallister
2018-04-08 15:54:58 +01:00
committed by GitHub
parent d7ef956935
commit 982eebfc74
28 changed files with 345 additions and 908 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/Ocelot.AcceptanceTests/WebSocketTests.cs
View File

@ -37,7 +37,7 @@ namespace Ocelot.AcceptanceTests
}
[Fact]
public async Task should_proxy_websocket_input_to_downstream_service()
public void should_proxy_websocket_input_to_downstream_service()
{
var downstreamPort = 5001;
var downstreamHost = "localhost";
@ -72,7 +72,7 @@ namespace Ocelot.AcceptanceTests
}
[Fact]
public async Task should_proxy_websocket_input_to_downstream_service_and_use_load_balancer()
public void should_proxy_websocket_input_to_downstream_service_and_use_load_balancer()
{
var downstreamPort = 5005;
var downstreamHost = "localhost";
@ -116,7 +116,7 @@ namespace Ocelot.AcceptanceTests
}
[Fact]
public async Task should_proxy_websocket_input_to_downstream_service_and_use_service_discovery_and_load_balancer()
public void should_proxy_websocket_input_to_downstream_service_and_use_service_discovery_and_load_balancer()
{
var downstreamPort = 5007;
var downstreamHost = "localhost";
@ -274,7 +274,6 @@ namespace Ocelot.AcceptanceTests
{
_firstRecieved.Add(Encoding.UTF8.GetString(buffer, 0, result.Count));
}
else if (result.MessageType == WebSocketMessageType.Close)
{
await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None);
@ -321,7 +320,6 @@ namespace Ocelot.AcceptanceTests
{
_secondRecieved.Add(Encoding.UTF8.GetString(buffer, 0, result.Count));
}
else if (result.MessageType == WebSocketMessageType.Close)
{
await client.CloseAsync(WebSocketCloseStatus.NormalClosure, "", CancellationToken.None);
@ -333,7 +331,6 @@ namespace Ocelot.AcceptanceTests
await Task.WhenAll(sending, receiving);
}
private async Task StartFakeDownstreamService(string url, string path)
{
_firstDownstreamHost = new WebHostBuilder()
@ -380,7 +377,6 @@ namespace Ocelot.AcceptanceTests
await _firstDownstreamHost.StartAsync();
}
private async Task StartSecondFakeDownstreamService(string url, string path)
{
_secondDownstreamHost = new WebHostBuilder()
@ -427,7 +423,6 @@ namespace Ocelot.AcceptanceTests
await _secondDownstreamHost.StartAsync();
}
private async Task Echo(WebSocket webSocket)
{
try