Address flaky unit tests

src/CommonUtilities.Tests/ArmEnvironmentEndpointsTests.cs

@@ -6,7 +6,7 @@
 
 namespace CommonUtilities.Tests
 {
-    [TestClass]
+    [TestClass, TestCategory("Integration")]
     public class ArmEnvironmentEndpointsTests
     {
         public enum Cloud

src/CommonUtilities/AzureCloudConfig.cs

@@ -151,6 +151,35 @@ public static Task<AzureCloudConfig> FromKnownCloudNameAsync(string cloudName =
             };
         }
 
+        public static AzureCloudConfig ForUnitTesting()
+        {
+            return new()
+            {
+                PortalUrl = "http://portal.test",
+                Authentication = new() { Tenant = "common" },
+                MediaUrl = "http://media.test",
+                GraphAudienceUrl = "http://graph.test",
+                Name = "Test",
+                Suffixes = new()
+                {
+                    AcrLoginServerSuffix = "azurecr.io",
+                    KeyVaultDnsSuffix = "vault.azure.net",
+                    StorageSuffix = "core.windows.net",
+                    PostgresqlServerEndpointSuffix = "postgres.database.azure.com"
+                },
+                BatchUrl = "https://batch.core.windows.net/",
+                ResourceManagerUrl = "https://management.azure.com/",
+                MicrosoftGraphResourceUrl = "http://graph.test",
+                ApplicationInsightsResourceUrl = "https://api.applicationinsights.io",
+                ApplicationInsightsTelemetryChannelResourceUrl = "https://dc.applicationinsights.azure.com/v2/track",
+
+                DefaultTokenScope = "https://management.azure.com//.default",
+                ArmEnvironment = new(new("https://management.azure.com/"), "https://management.azure.com/"),
+                Domain = "Test",
+                AzureEnvironmentConfig = new("https://login.microsoftonline.com", "https://management.azure.com//.default", "core.windows.net")
+            };
+        }
+
         private static readonly Uri AzurePublicCloud = Azure.ResourceManager.ArmEnvironment.AzurePublicCloud.Endpoint;
         private static readonly Uri AzureUSGovernmentCloud = Azure.ResourceManager.ArmEnvironment.AzureGovernment.Endpoint;
         private static readonly Uri AzureChinaCloud = Azure.ResourceManager.ArmEnvironment.AzureChina.Endpoint;

src/Tes.ApiClients.Tests/TerraSamApiClientTests.cs

@@ -30,7 +30,7 @@ public void SetUp()
             cache.Setup(c => c.CreateEntry(It.IsAny<object>())).Returns(new Mock<Microsoft.Extensions.Caching.Memory.ICacheEntry>().Object);
             cacheAndRetryBuilder.SetupGet(c => c.AppCache).Returns(cache.Object);
             cacheAndRetryHandler = new(TestServices.RetryHandlersHelpers.GetCachingAsyncRetryPolicyMock(cacheAndRetryBuilder, c => c.DefaultRetryHttpResponseMessagePolicyBuilder()));
-            azureEnvironmentConfig = ExpensiveObjectTestUtility.AzureCloudConfig.AzureEnvironmentConfig!;
+            azureEnvironmentConfig = CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting().AzureEnvironmentConfig!;
 
             terraSamApiClient = new TerraSamApiClient(TerraApiStubData.SamApiHost, tokenCredential.Object,
                 cacheAndRetryBuilder.Object, azureEnvironmentConfig, NullLogger<TerraSamApiClient>.Instance);

src/Tes.ApiClients.Tests/TerraWsmApiClientTests.cs

@@ -32,7 +32,7 @@ public void SetUp()
             cache.Setup(c => c.CreateEntry(It.IsAny<object>())).Returns(new Mock<Microsoft.Extensions.Caching.Memory.ICacheEntry>().Object);
             cacheAndRetryBuilder.SetupGet(c => c.AppCache).Returns(cache.Object);
             cacheAndRetryHandler = new(TestServices.RetryHandlersHelpers.GetCachingAsyncRetryPolicyMock(cacheAndRetryBuilder, c => c.DefaultRetryHttpResponseMessagePolicyBuilder()));
-            azureEnvironmentConfig = AzureEnvironmentConfig.FromArmEnvironmentEndpoints(CommonUtilities.AzureCloud.AzureCloudConfig.FromKnownCloudNameAsync(CommonUtilities.AzureCloud.AzureCloudConfig.DefaultAzureCloudName).Result);
+            azureEnvironmentConfig = AzureEnvironmentConfig.FromArmEnvironmentEndpoints(CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting());
 
             terraWsmApiClient = new TerraWsmApiClient(TerraApiStubData.WsmApiHost, tokenCredential.Object,
                 cacheAndRetryBuilder.Object, azureEnvironmentConfig, NullLogger<TerraWsmApiClient>.Instance);

src/Tes.Runner.Test/Storage/ArmUrlTransformationStrategyTests.cs

@@ -27,7 +27,7 @@ public void SetUp()
             mockBlobServiceClient = new Mock<BlobServiceClient>();
             RuntimeOptions options = new()
             {
-                AzureEnvironmentConfig = AzureEnvironmentConfig.FromArmEnvironmentEndpoints(CommonUtilities.AzureCloud.AzureCloudConfig.FromKnownCloudNameAsync().Result)
+                AzureEnvironmentConfig = AzureEnvironmentConfig.FromArmEnvironmentEndpoints(CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting())
             };
 
             mockBlobApiHttpUtils = new();

src/TesApi.Tests/PriceApiBatchSkuInformationProviderTests.cs

@@ -33,7 +33,7 @@ public void Initialize()
 
             cachingRetryHandler = new CachingRetryPolicyBuilder(appCache, mockRetryOptions.Object);
             pricingApiClient = new PriceApiClient(cachingRetryHandler, new NullLogger<PriceApiClient>());
-            var config = ExpensiveObjectTestUtility.AzureCloudConfig;
+            var config = CommonUtilities.AzureCloud.AzureCloudConfig.FromKnownCloudNameAsync().Result;
             provider = new PriceApiBatchSkuInformationProvider(pricingApiClient, config, new NullLogger<PriceApiBatchSkuInformationProvider>());
             //using var serviceProvider = new TestServices.TestServiceProvider<PriceApiBatchSkuInformationProvider>();
             //var provider = serviceProvider.GetT();

src/TesApi.Tests/Runner/TaskToNodeTaskConverterTests.cs

@@ -78,7 +78,7 @@ public void SetUp()
                     x.GetBlobUrlsAsync(It.IsAny<Uri>(), It.IsAny<CancellationToken>()))
                 .Returns(Task.FromResult<IList<Uri>>([]));
 
-            var azureCloudIdentityConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result.AzureEnvironmentConfig;
+            var azureCloudIdentityConfig = AzureCloudConfig.ForUnitTesting().AzureEnvironmentConfig;
             taskToNodeTaskConverter = new TaskToNodeTaskConverter(Options.Create(terraOptions), Options.Create(storageOptions),
                 storageAccessProviderMock.Object, azureProxyMock.Object, azureCloudIdentityConfig, new NullLogger<TaskToNodeTaskConverter>());
         }

src/TesApi.Tests/StartupTests.cs

@@ -62,7 +62,7 @@ public void SetUp()
             services.AddSingleton(hostEnv.Object);
 #pragma warning restore CS0618
 
-            Startup.AzureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
+            Startup.AzureCloudConfig = AzureCloudConfig.ForUnitTesting();
             var configuration = builder.Build();
             services.AddSingleton(configuration);
             services.AddSingleton<IConfiguration>(configuration);

src/TesApi.Tests/Storage/DefaultStorageAccessProviderTests.cs

@@ -43,7 +43,7 @@ public void Setup()
             };
             azureProxyMock.Setup(p => p.GetStorageAccountKeyAsync(It.IsAny<StorageAccountInfo>(), It.IsAny<CancellationToken>())).ReturnsAsync(GenerateRandomTestAzureStorageKey());
             azureProxyMock.Setup(p => p.GetStorageAccountInfoAsync(It.Is<string>(s => s.Equals(DefaultStorageAccountName)), It.IsAny<CancellationToken>())).ReturnsAsync(storageAccountInfo);
-            var config = ExpensiveObjectTestUtility.AzureCloudConfig.AzureEnvironmentConfig;
+            var config = CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting().AzureEnvironmentConfig;
             defaultStorageAccessProvider = new DefaultStorageAccessProvider(NullLogger<DefaultStorageAccessProvider>.Instance, Options.Create(storageOptions), azureProxyMock.Object, config);
         }
 

src/TesApi.Tests/TerraStorageAccessProviderTests.cs

@@ -48,7 +48,7 @@ public void SetUp()
             batchSchedulingOptions = new BatchSchedulingOptions() { Prefix = BatchSchedulingPrefix };
             optionsMock.Setup(o => o.Value).Returns(terraOptions);
             azureProxyMock = new Mock<IAzureProxy>();
-            var config = ExpensiveObjectTestUtility.AzureCloudConfig.AzureEnvironmentConfig;
+            var config = CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting().AzureEnvironmentConfig;
             terraStorageAccessProvider = new TerraStorageAccessProvider(new(wsmApiClientMock.Object), azureProxyMock.Object, optionsMock.Object, Options.Create(batchSchedulingOptions), config, NullLogger<TerraStorageAccessProvider>.Instance);
         }
 

src/TesApi.Tests/TestServices/TestServiceProvider.cs

@@ -48,7 +48,7 @@ internal TestServiceProvider(
             Action<IServiceCollection> additionalActions = default)
         {
             Configuration = GetConfiguration(configuration);
-            var azureCloudConfig = ExpensiveObjectTestUtility.AzureCloudConfig;
+            var azureCloudConfig = CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting();
             provider = new ServiceCollection()
                 .AddSingleton(_ => new TesServiceInfo { CreatedAt = DateTimeOffset.UtcNow, Environment = "unittest", Id = "unit-test-id", Organization = new() { Name = "unit-test-org", Url = "http://localhost/" }, Storage = [], UpdatedAt = DateTimeOffset.UtcNow })
                 .AddSingleton(azureCloudConfig)

src/deploy-tes-on-azure.Tests/KubernetesManagerTests.cs

@@ -14,7 +14,7 @@ public class KubernetesManagerTests
         [TestMethod]
         public async Task ValuesTemplateSuccessfullyDeserializesTesdatabaseToYaml()
         {
-            var manager = new KubernetesManager(new(), ExpensiveObjectTestUtility.AzureCloudConfig, (_, _, _) => throw new System.NotImplementedException(), System.Threading.CancellationToken.None);
+            var manager = new KubernetesManager(new(), CommonUtilities.AzureCloud.AzureCloudConfig.ForUnitTesting(), (_, _, _) => throw new System.NotImplementedException(), System.Threading.CancellationToken.None);
             var helmValues = await manager.GetHelmValuesAsync(@"./cromwell-on-azure/helm/values-template.yaml");
             Assert.IsNotNull(helmValues.TesDatabase);
         }