Make pardon command test non-destructive (#18518)
This commit is contained in:
@@ -2,6 +2,7 @@ using System.Linq;
|
||||
using Content.Server.Database;
|
||||
using Robust.Server.Console;
|
||||
using Robust.Server.Player;
|
||||
using Robust.Shared.Network;
|
||||
|
||||
namespace Content.IntegrationTests.Tests.Commands
|
||||
{
|
||||
@@ -14,18 +15,20 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
[Test]
|
||||
public async Task PardonTest()
|
||||
{
|
||||
await using var pairTracker = await PoolManager.GetServerClient(new() { Destructive = true });
|
||||
await using var pairTracker = await PoolManager.GetServerClient();
|
||||
var server = pairTracker.Pair.Server;
|
||||
var client = pairTracker.Pair.Client;
|
||||
|
||||
var sPlayerManager = server.ResolveDependency<IPlayerManager>();
|
||||
var sConsole = server.ResolveDependency<IServerConsoleHost>();
|
||||
var sDatabase = server.ResolveDependency<IServerDbManager>();
|
||||
|
||||
await server.WaitAssertion(async () =>
|
||||
{
|
||||
var netMan = client.ResolveDependency<IClientNetManager>();
|
||||
var clientSession = sPlayerManager.Sessions.Single();
|
||||
var clientId = clientSession.UserId;
|
||||
|
||||
Assert.That(netMan.IsConnected);
|
||||
|
||||
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
|
||||
// No bans on record
|
||||
Assert.Multiple(async () =>
|
||||
{
|
||||
@@ -35,7 +38,7 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
});
|
||||
|
||||
// Try to pardon a ban that does not exist
|
||||
sConsole.ExecuteCommand("pardon 1");
|
||||
await server.WaitPost(() => sConsole.ExecuteCommand("pardon 1"));
|
||||
|
||||
// Still no bans on record
|
||||
Assert.Multiple(async () =>
|
||||
@@ -47,8 +50,9 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
|
||||
var banReason = "test";
|
||||
|
||||
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
|
||||
// Ban the client for 24 hours
|
||||
sConsole.ExecuteCommand($"ban {clientSession.Name} {banReason} 1440");
|
||||
await server.WaitPost(() => sConsole.ExecuteCommand($"ban {clientSession.Name} {banReason} 1440"));
|
||||
|
||||
// Should have one ban on record now
|
||||
Assert.Multiple(async () =>
|
||||
@@ -58,8 +62,12 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
|
||||
});
|
||||
|
||||
await PoolManager.RunTicksSync(pairTracker.Pair, 5);
|
||||
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
|
||||
Assert.That(!netMan.IsConnected);
|
||||
|
||||
// Try to pardon a ban that does not exist
|
||||
sConsole.ExecuteCommand("pardon 2");
|
||||
await server.WaitPost(() => sConsole.ExecuteCommand("pardon 2"));
|
||||
|
||||
// The existing ban is unaffected
|
||||
Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Not.Null);
|
||||
@@ -84,7 +92,7 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
});
|
||||
|
||||
// Pardon the actual ban
|
||||
sConsole.ExecuteCommand("pardon 1");
|
||||
await server.WaitPost(() => sConsole.ExecuteCommand("pardon 1"));
|
||||
|
||||
// No bans should be returned
|
||||
Assert.That(await sDatabase.GetServerBanAsync(null, clientId, null), Is.Null);
|
||||
@@ -119,7 +127,7 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
});
|
||||
|
||||
// Try to pardon it again
|
||||
sConsole.ExecuteCommand("pardon 1");
|
||||
await server.WaitPost(() => sConsole.ExecuteCommand("pardon 1"));
|
||||
|
||||
// Nothing changes
|
||||
Assert.Multiple(async () =>
|
||||
@@ -133,7 +141,14 @@ namespace Content.IntegrationTests.Tests.Commands
|
||||
// The list is still returned since that ignores pardons
|
||||
Assert.That(await sDatabase.GetServerBansAsync(null, clientId, null), Has.Count.EqualTo(1));
|
||||
});
|
||||
});
|
||||
|
||||
// Reconnect client. Slightly faster than dirtying the pair.
|
||||
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(0));
|
||||
client.SetConnectTarget(server);
|
||||
await client.WaitPost(() => netMan.ClientConnect(null!, 0, null!));
|
||||
await PoolManager.ReallyBeIdle(pairTracker.Pair);
|
||||
Assert.That(sPlayerManager.Sessions.Count(), Is.EqualTo(1));
|
||||
|
||||
await pairTracker.CleanReturnAsync();
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user