From 128dfbc28f73101897d10b5b470227c67f8d247b Mon Sep 17 00:00:00 2001 From: danielmarbach Date: Fri, 20 Nov 2020 13:42:50 +0100 Subject: [PATCH] When core installers are disabled nothing should run Rename the test Remove redundant line --- .../Subscriptions/SubscriptionStorageInstallerFeature.cs | 7 +++++++ .../SynchronizedStorageInstallerFeature.cs | 6 ++++++ ...saga_table_doesnt_exist_and_table_creation_disabled.cs} | 2 +- 3 files changed, 14 insertions(+), 1 deletion(-) rename src/SharedAcceptanceTests.All/{When_saga_table_doesnt_exist_and_schema_creation_off.cs => When_saga_table_doesnt_exist_and_table_creation_disabled.cs} (96%) diff --git a/src/NServiceBus.Persistence.AzureTable/Subscriptions/SubscriptionStorageInstallerFeature.cs b/src/NServiceBus.Persistence.AzureTable/Subscriptions/SubscriptionStorageInstallerFeature.cs index b50274f7..f2e181ff 100644 --- a/src/NServiceBus.Persistence.AzureTable/Subscriptions/SubscriptionStorageInstallerFeature.cs +++ b/src/NServiceBus.Persistence.AzureTable/Subscriptions/SubscriptionStorageInstallerFeature.cs @@ -13,6 +13,13 @@ public SubscriptionStorageInstallerFeature() protected override void Setup(FeatureConfigurationContext context) { var settings = context.Settings.Get(); + + // if it hasn't been explicitly disabled installer settings need to be considered + if (!settings.Disabled) + { + settings.Disabled = !context.Settings.GetOrDefault("Installers.Enable"); + } + if (settings.Disabled) { return; diff --git a/src/NServiceBus.Persistence.AzureTable/SynchronizedStorage/SynchronizedStorageInstallerFeature.cs b/src/NServiceBus.Persistence.AzureTable/SynchronizedStorage/SynchronizedStorageInstallerFeature.cs index 5f2b5d3d..d439e6ee 100644 --- a/src/NServiceBus.Persistence.AzureTable/SynchronizedStorage/SynchronizedStorageInstallerFeature.cs +++ b/src/NServiceBus.Persistence.AzureTable/SynchronizedStorage/SynchronizedStorageInstallerFeature.cs @@ -13,6 +13,12 @@ protected override void Setup(FeatureConfigurationContext context) { var settings = context.Settings.Get(); + // if it hasn't been explicitly disabled installer settings need to be considered + if (!settings.Disabled) + { + settings.Disabled = !context.Settings.GetOrDefault("Installers.Enable"); + } + if (settings.Disabled) { return; diff --git a/src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_schema_creation_off.cs b/src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_table_creation_disabled.cs similarity index 96% rename from src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_schema_creation_off.cs rename to src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_table_creation_disabled.cs index aa61bf58..103ea093 100644 --- a/src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_schema_creation_off.cs +++ b/src/SharedAcceptanceTests.All/When_saga_table_doesnt_exist_and_table_creation_disabled.cs @@ -10,7 +10,7 @@ namespace NServiceBus.AcceptanceTests using EndpointTemplates; using NUnit.Framework; - public partial class When_saga_table_doesnt_exist_and_schema_creation_off : NServiceBusAcceptanceTest + public partial class When_saga_table_doesnt_exist_and_table_creation_disabled : NServiceBusAcceptanceTest { [Test] public void Should_throw_not_supported()