From bb4bbbb8a88ad9554a81975b29a173d1e47216c8 Mon Sep 17 00:00:00 2001 From: DrSmugleaf Date: Mon, 14 Dec 2020 08:49:33 +0100 Subject: [PATCH] Make ReconnectTest async behavior consistent (#2728) * 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 --- .../Tests/Networking/ReconnectTest.cs | 34 ++++--------------- 1 file changed, 6 insertions(+), 28 deletions(-) diff --git a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs index bbecd71254..aea01d41c5 100644 --- a/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs +++ b/Content.IntegrationTests/Tests/Networking/ReconnectTest.cs @@ -18,51 +18,29 @@ namespace Content.IntegrationTests.Tests.Networking await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); // Connect. - client.SetConnectTarget(server); - client.Post(() => IoCManager.Resolve().ClientConnect(null, 0, null)); + await client.WaitPost(() => IoCManager.Resolve().ClientConnect(null, 0, null)); // Run some ticks for the handshake to complete and such. - - for (var i = 0; i < 10; i++) - { - server.RunTicks(1); - await server.WaitIdleAsync(); - client.RunTicks(1); - await client.WaitIdleAsync(); - } + await RunTicksSync(client, server, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); - client.Post(() => IoCManager.Resolve().ProcessCommand("disconnect")); + await client.WaitPost(() => IoCManager.Resolve().ProcessCommand("disconnect")); // Run some ticks for the disconnect to complete and such. - for (var i = 0; i < 5; i++) - { - server.RunTicks(1); - await server.WaitIdleAsync(); - client.RunTicks(1); - await client.WaitIdleAsync(); - } + await RunTicksSync(client, server, 5); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); // Reconnect. - client.SetConnectTarget(server); - client.Post(() => IoCManager.Resolve().ClientConnect(null, 0, null)); + await client.WaitPost(() => IoCManager.Resolve().ClientConnect(null, 0, null)); // Run some ticks for the handshake to complete and such. - - for (var i = 0; i < 10; i++) - { - server.RunTicks(1); - await server.WaitIdleAsync(); - client.RunTicks(1); - await client.WaitIdleAsync(); - } + await RunTicksSync(client, server, 10); await Task.WhenAll(client.WaitIdleAsync(), server.WaitIdleAsync()); }