another attempt to fix the tests

Author: bartekwasielak

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_failed_edit_is_resolved_by_retry.cs

@@ -15,16 +15,30 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     class When_a_failed_edit_is_resolved_by_retry : ExternalIntegrationAcceptanceTest
     {
         [Test]
-        [Ignore("Isolating another test")]
         public async Task Should_publish_notification()
         {
+            CustomConfiguration = config => config.OnEndpointSubscribed<EditMessageResolutionContext>((s, ctx) =>
+            {
+                ctx.ExternalProcessorSubscribed = s.SubscriberReturnAddress.Contains(nameof(MessageReceiver));
+            });
+
             var context = await Define<EditMessageResolutionContext>()
                 .WithEndpoint<MessageReceiver>(b => b.When(async (bus, c) =>
                 {
                     await bus.Subscribe<MessageFailureResolvedByRetry>();
+
+                    if (c.HasNativePubSubSupport)
+                    {
+                        c.ExternalProcessorSubscribed = true;
+                    }
                 }).When(c => c.SendLocal(new EditResolutionMessage())).DoNotFailOnErrorMessages())
                 .Done(async ctx =>
                 {
+                    if (!ctx.ExternalProcessorSubscribed)
+                    {
+                        return false;
+                    }
+
                     if (!ctx.OriginalMessageHandled)
                     {
                         return false;
@@ -109,6 +123,7 @@ public class EditMessageResolutionContext : ScenarioContext
             public bool EditedAndRetriedMessage { get; set; }
             public bool RetriedMessage { get; set; }
             public string EditedMessageEditOf { get; set; }
+            public bool ExternalProcessorSubscribed { get; set; }
         }
 
         public class MessageReceiver : EndpointConfigurationBuilder

src/ServiceControl.AcceptanceTests/Recoverability/ExternalIntegration/When_a_reedit_solves_a_failed_msg.cs

@@ -15,17 +15,31 @@ namespace ServiceControl.AcceptanceTests.Recoverability.ExternalIntegration
     class When_a_reedit_solves_a_failed_msg : AcceptanceTest
     {
         [Test]
-        [Ignore("Isolating another test")]
         public async Task Should_publish_notification()
         {
+            CustomConfiguration = config => config.OnEndpointSubscribed<EditMessageResolutionContext>((s, ctx) =>
+            {
+                ctx.ExternalProcessorSubscribed = s.SubscriberReturnAddress.Contains(nameof(MessageReceiver));
+            });
+
             var context = await Define<EditMessageResolutionContext>()
                 .WithEndpoint<MessageReceiver>(b => b.When(async (bus, c) =>
                     {
                         await bus.Subscribe<MessageFailureResolvedByRetry>();
+
+                        if (c.HasNativePubSubSupport)
+                        {
+                            c.ExternalProcessorSubscribed = true;
+                        }
                     }).When(c => c.SendLocal(new EditResolutionMessage() { MessageAttempt = 0 }))
                     .DoNotFailOnErrorMessages())
                 .Done(async ctx =>
                 {
+                    if (!ctx.ExternalProcessorSubscribed)
+                    {
+                        return false;
+                    }
+
                     if (!ctx.OriginalMessageHandled)
                     {
                         return false;
@@ -124,6 +138,7 @@ public class EditMessageResolutionContext : ScenarioContext
             public string SecondMessageFailureId { get; set; }
             public string EditedMessageEditOf2 { get; set; }
             public string EditedMessageEditOf1 { get; set; }
+            public bool ExternalProcessorSubscribed { get; set; }
         }
 
         public class MessageReceiver : EndpointConfigurationBuilder