Thanks who ever wrote a test with dependency on log output message without making this dependency visible :yakshaving:

Author: ramonsmits

src/ServiceControl.Audit.AcceptanceTests.RavenDB/Auditing/When_critical_storage_threshold_reached.cs

@@ -4,6 +4,7 @@
     using System.Linq;
     using System.Threading.Tasks;
     using AcceptanceTesting.EndpointTemplates;
+    using Audit.Auditing;
     using Microsoft.Extensions.DependencyInjection;
     using NServiceBus;
     using NServiceBus.AcceptanceTesting;
@@ -35,8 +36,7 @@ await Define<ScenarioContext>()
                     .When(context =>
                     {
                         return context.Logs.ToArray().Any(i =>
-                            i.Message.StartsWith(
-                                "Ensure started. Infrastructure started"));
+                            i.Message.StartsWith(AuditIngestion.LogMessages.StartedInfrastructure));
                     }, (_, __) =>
                     {
                         var databaseConfiguration = ServiceProvider.GetRequiredService<DatabaseConfiguration>();
@@ -47,8 +47,7 @@ await Define<ScenarioContext>()
                     .When(context =>
                     {
                         return context.Logs.ToArray().Any(i =>
-                            i.Message.StartsWith(
-                                "Shutting down due to failed persistence health check. Infrastructure shut down completed"));
+                            i.Message.StartsWith(AuditIngestion.LogMessages.StoppedInfrastructure));
                     }, (bus, c) => bus.SendLocal(new MyMessage()))
                 )
                 .Done(async c => await this.TryGetSingle<MessagesView>(
@@ -72,7 +71,7 @@ await Define<ScenarioContext>()
                    {
                        return context.Logs.ToArray().Any(i =>
                            i.Message.StartsWith(
-                               "Ensure started. Infrastructure started"));
+                                AuditIngestion.LogMessages.StartedInfrastructure));
                    }, (session, context) =>
                    {
                        var databaseConfiguration = ServiceProvider.GetRequiredService<DatabaseConfiguration>();
@@ -83,8 +82,7 @@ await Define<ScenarioContext>()
                    .When(context =>
                    {
                        ingestionShutdown = context.Logs.ToArray().Any(i =>
-                           i.Message.StartsWith(
-                               "Shutting down due to failed persistence health check. Infrastructure shut down completed"));
+                           i.Message.StartsWith(AuditIngestion.LogMessages.StoppedInfrastructure));
 
                        return ingestionShutdown;
                    },

src/ServiceControl.Audit/Auditing/AuditIngestion.cs

@@ -130,7 +130,7 @@ async Task SetUpAndStartInfrastructure(CancellationToken cancellationToken)
                 await auditIngestor.VerifyCanReachForwardingAddress();
                 await queueIngestor.StartReceive(cancellationToken);
 
-                logger.Info("Started infrastructure");
+                logger.Info(LogMessages.StartedInfrastructure);
             }
             catch (Exception e)
             {
@@ -163,7 +163,7 @@ async Task StopAndTeardownInfrastructure(CancellationToken cancellationToken)
                 }
 
                 queueIngestor = null;
-                logger.Info("Stopped infrastructure");
+                logger.Info(LogMessages.StoppedInfrastructure);
             }
             catch (Exception e)
             {
@@ -335,5 +335,11 @@ public override async Task StopAsync(CancellationToken cancellationToken)
         readonly IHostApplicationLifetime applicationLifetime;
 
         static readonly ILog logger = LogManager.GetLogger<AuditIngestion>();
+
+        internal static class LogMessages
+        {
+            internal const string StartedInfrastructure = "Started infrastructure";
+            internal const string StoppedInfrastructure = "Stopped infrastructure";
+        }
     }
 }