Make tests faster (#8737)

* Test changes

* Make finding the test tile a little smarter
This commit is contained in:
wrexbe
2022-06-19 20:22:28 -07:00
committed by GitHub
parent bd54b8de25
commit 81e3b2da88
80 changed files with 1769 additions and 1788 deletions

View File

@@ -11,7 +11,7 @@ using Robust.Shared.Utility;
namespace Content.YAMLLinter
{
internal class Program : ContentIntegrationTest
internal class Program
{
private static int Main(string[] args)
{
@@ -45,45 +45,36 @@ namespace Content.YAMLLinter
private async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateClient()
{
var client = StartClient(new ClientContentIntegrationOption()
{
FailureLogLevel = null,
});
await client.WaitIdleAsync();
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{DummyTicker = true, Disconnected = true});
var client = pairTracker.Pair.Client;
var cPrototypeManager = client.ResolveDependency<IPrototypeManager>();
var clientErrors = new Dictionary<string, HashSet<ErrorNode>>();
await client.WaitAssertion(() =>
await client.WaitPost(() =>
{
clientErrors = cPrototypeManager.ValidateDirectory(new ResourcePath("/Prototypes"));
});
client.Stop();
await pairTracker.CleanReturnAsync();
return clientErrors;
}
private async Task<Dictionary<string, HashSet<ErrorNode>>> ValidateServer()
{
var server = StartServer(new ServerContentIntegrationOption()
{
FailureLogLevel = null,
CVarOverrides = { {CCVars.GameDummyTicker.Name, "true"} }
});
await server.WaitIdleAsync();
await using var pairTracker = await PoolManager.GetServerClient(new PoolSettings{DummyTicker = true, Disconnected = true});
var server = pairTracker.Pair.Server;
var sPrototypeManager = server.ResolveDependency<IPrototypeManager>();
var serverErrors = new Dictionary<string, HashSet<ErrorNode>>();
await server.WaitAssertion(() =>
await server.WaitPost(() =>
{
serverErrors = sPrototypeManager.ValidateDirectory(new ResourcePath("/Prototypes"));
});
server.Stop();
await pairTracker.CleanReturnAsync();
return serverErrors;
}
@@ -92,9 +83,8 @@ namespace Content.YAMLLinter
{
var allErrors = new Dictionary<string, HashSet<ErrorNode>>();
var tasks = await Task.WhenAll(ValidateClient(), ValidateServer());
var clientErrors = tasks[0];
var serverErrors = tasks[1];
var serverErrors = await ValidateServer();
var clientErrors = await ValidateClient();
foreach (var (key, val) in serverErrors)
{