]> git.smokeofanarchy.ru Git - space-station-14.git/commitdiff
Fix tests not failing when errors get logged (#15723)
authorLeon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Mon, 24 Apr 2023 06:34:12 +0000 (18:34 +1200)
committerGitHub <noreply@github.com>
Mon, 24 Apr 2023 06:34:12 +0000 (16:34 +1000)
Content.IntegrationTests/PoolManager.cs

index d80b12d07a09ff6920446347fddc185f30701a09..92e96bd15cfcb8b9b39b0b2eda714fe3e8d42218 100644 (file)
@@ -101,6 +101,10 @@ public static class PoolManager
             }
         };
 
+        var logHandler = new PoolTestLogHandler("SERVER");
+        logHandler.ActivateContext(testOut);
+        options.OverrideLogHandler = () => logHandler;
+
         options.BeforeStart += () =>
         {
             IoCManager.Resolve<IEntitySystemManager>()
@@ -116,13 +120,10 @@ public static class PoolManager
             IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<DeviceNetworkTestSystem>();
             IoCManager.Resolve<IEntitySystemManager>().LoadExtraSystemType<TestDestructibleListenerSystem>();
             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);
 
         var server = new RobustIntegrationTest.ServerIntegrationInstance(options);
@@ -199,6 +200,10 @@ public static class PoolManager
             // LoadContentResources = !poolSettings.NoLoadContent
         };
 
+        var logHandler = new PoolTestLogHandler("CLIENT");
+        logHandler.ActivateContext(testOut);
+        options.OverrideLogHandler = () => logHandler;
+
         options.BeforeStart += () =>
         {
             IoCManager.Resolve<IModLoader>().SetModuleBaseCallbacks(new ClientModuleTestingCallbacks
@@ -211,14 +216,12 @@ public static class PoolManager
                         .RegisterClass<SimplePredictReconcileTest.PredictionTestComponent>();
                     IoCManager.Register<IParallaxManager, DummyParallaxManager>(true);
                     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);
 
         var client = new RobustIntegrationTest.ClientIntegrationInstance(options);