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

Fix tests not failing when errors get logged (#15723)

Browse Source
This commit is contained in:
Leon Friedrich
2023-04-24 18:34:12 +12:00
committed by GitHub
parent d3552dae00
commit 29787f3944
1 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Content.IntegrationTests/PoolManager.cs
View File

@@ -101,6 +101,10 @@ public static class PoolManager
} }
}; };
var logHandler = new PoolTestLogHandler("SERVER");
logHandler.ActivateContext(testOut);
options.OverrideLogHandler = () => logHandler;
options.BeforeStart += () => options.BeforeStart += () =>
{ {
IoCManager.Resolve<IEntitySystemManager>() IoCManager.Resolve<IEntitySystemManager>()
@@ -116,13 +120,10 @@ public static class PoolManager
IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>(); IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>();
IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<TestDestructibleListenerSystem>(); IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<TestDestructibleListenerSystem>();
IoCManager.Resolve<ILogManager>().GetSawmill("loc").Level = LogLevel.Error; IoCManager.Resolve<ILogManager>().GetSawmill("loc").Level = LogLevel.Error;
IoCManager.Resolve<IConfigurationManager>()
.OnValueChanged(RTCVars.FailureLogLevel, value => logHandler.FailureLevel = value, true);
}; };
var logHandler = new PoolTestLogHandler("SERVER");
logHandler.ActivateContext(testOut);
options.OverrideLogHandler = () => logHandler;
SetupCVars(poolSettings, options); SetupCVars(poolSettings, options);
var server = new RobustIntegrationTest.ServerIntegrationInstance(options); var server = new RobustIntegrationTest.ServerIntegrationInstance(options);
@@ -199,6 +200,10 @@ public static class PoolManager
// LoadContentResources = !poolSettings.NoLoadContent // LoadContentResources = !poolSettings.NoLoadContent
}; };
var logHandler = new PoolTestLogHandler("CLIENT");
logHandler.ActivateContext(testOut);
options.OverrideLogHandler = () => logHandler;
options.BeforeStart += () => options.BeforeStart += () =>
{ {
IoCManager.Resolve<IModLoader>().SetModuleBaseCallbacks(new ClientModuleTestingCallbacks IoCManager.Resolve<IModLoader>().SetModuleBaseCallbacks(new ClientModuleTestingCallbacks
@@ -211,14 +216,12 @@ public static class PoolManager
.RegisterClass<SimplePredictReconcileTest.PredictionTestComponent>(); .RegisterClass<SimplePredictReconcileTest.PredictionTestComponent>();
IoCManager.Register<IParallaxManager, DummyParallaxManager>(true); IoCManager.Register<IParallaxManager, DummyParallaxManager>(true);
IoCManager.Resolve<ILogManager>().GetSawmill("loc").Level = LogLevel.Error; IoCManager.Resolve<ILogManager>().GetSawmill("loc").Level = LogLevel.Error;
IoCManager.Resolve<IConfigurationManager>()
.OnValueChanged(RTCVars.FailureLogLevel, value => logHandler.FailureLevel = value, true);
} }
}); });
}; };
var logHandler = new PoolTestLogHandler("CLIENT");
logHandler.ActivateContext(testOut);
options.OverrideLogHandler = () => logHandler;
SetupCVars(poolSettings, options); SetupCVars(poolSettings, options);
var client = new RobustIntegrationTest.ClientIntegrationInstance(options); var client = new RobustIntegrationTest.ClientIntegrationInstance(options);