tommy/tbd-station-14
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make ReconnectTest async behavior consistent (#2728)

Browse Source 
* Try to fix reconnect test

* Use RunTicksSync in ReconnectTest

* Change the top part as well

* Await the other post

* Update RobustToolbox

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into fix-reconnect-test-maybe

* Reset RobustToolbox

* Update RobustToolbox

* Merge branch 'master' of https://github.com/space-wizards/space-station-14 into fix-reconnect-test-maybe

* Update RobustToolbox
This commit is contained in:
DrSmugleaf
2020-12-14 08:49:33 +01:00
committed by GitHub
parent d5eb68ac61
commit bb4bbbb8a8
1 changed files with 6 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
Content.IntegrationTests/Tests/Networking/ReconnectTest.cs
View File

@@ -18,51 +18,29 @@ namespace Content.IntegrationTests.Tests.Networking
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
// Connect. // Connect.
client.SetConnectTarget(server); client.SetConnectTarget(server);
client.Post(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null)); await client.WaitPost(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null));
// Run some ticks for the handshake to complete and such. // Run some ticks for the handshake to complete and such.
await RunTicksSync(client, server, 10);
for (var i = 0; i < 10; i++)
{
server.RunTicks(1);
await server.WaitIdleAsync();
client.RunTicks(1);
await client.WaitIdleAsync();
}
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
client.Post(() => IoCManager.Resolve<IClientConsole>().ProcessCommand("disconnect")); await client.WaitPost(() => IoCManager.Resolve<IClientConsole>().ProcessCommand("disconnect"));
// Run some ticks for the disconnect to complete and such. // Run some ticks for the disconnect to complete and such.
for (var i = 0; i < 5; i++) await RunTicksSync(client, server, 5);
{
server.RunTicks(1);
await server.WaitIdleAsync();
client.RunTicks(1);
await client.WaitIdleAsync();
}
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
// Reconnect. // Reconnect.
client.SetConnectTarget(server); client.SetConnectTarget(server);
client.Post(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null)); await client.WaitPost(() => IoCManager.Resolve<IClientNetManager>().ClientConnect(null, 0, null));
// Run some ticks for the handshake to complete and such. // Run some ticks for the handshake to complete and such.
await RunTicksSync(client, server, 10);
for (var i = 0; i < 10; i++)
{
server.RunTicks(1);
await server.WaitIdleAsync();
client.RunTicks(1);
await client.WaitIdleAsync();
}
await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync());
} }