Address flaky unit tests (#831)

microsoft · Nov 11, 2024 · 5bacc21 · 5bacc21
1 parent d22a03b
commit 5bacc21
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 20 deletions.
diff --git a/src/TriggerService.Tests/CromwellOnAzureEnvironmentTests.cs b/src/TriggerService.Tests/CromwellOnAzureEnvironmentTests.cs
@@ -19,7 +19,6 @@
 namespace TriggerService.Tests
 {
     [TestClass]
-    [Ignore]
     public class CromwellOnAzureEnvironmentTests
     {
         private const string azureName = "test";
@@ -160,8 +159,7 @@ private TriggerHostedService SetCromwellOnAzureEnvironment(string accountAuthori
                 ApplicationInsightsAccountName = "fakeappinsights"
             });
 
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
-            var environment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, repository, storageUtility.Object, azureCloudConfig);
+            var environment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, repository, storageUtility.Object, AzureCloudConfig.ForUnitTesting());
             return environment;
         }
 

diff --git a/src/TriggerService.Tests/ProcessAbortRequestTests.cs b/src/TriggerService.Tests/ProcessAbortRequestTests.cs
@@ -19,7 +19,6 @@
 namespace TriggerService.Tests
 {
     [TestClass]
-    [Ignore]
     public class ProcessAbortRequestTests
     {
         public ProcessAbortRequestTests()
@@ -103,8 +102,7 @@ public async Task FailedAbortRequestFileGetsMovedToFailedSubdirectory()
                 .Setup(x => x.GetStorageAccountsUsingMsiAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult((new List<IAzureStorage>(), azureStorage.Object)));
 
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
-            var cromwellOnAzureEnvironment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, repository.Object, storageUtility.Object, azureCloudConfig);
+            var cromwellOnAzureEnvironment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, repository.Object, storageUtility.Object, AzureCloudConfig.ForUnitTesting());
             await cromwellOnAzureEnvironment.ProcessAndAbortWorkflowsAsync();
             return (newTriggerName, newTriggerContent);
         }

diff --git a/src/TriggerService.Tests/ProcessNewWorkflowTests.cs b/src/TriggerService.Tests/ProcessNewWorkflowTests.cs
@@ -20,7 +20,6 @@
 namespace TriggerService.Tests
 {
     [TestClass]
-    [Ignore]
     public class ProcessNewWorkflowTests
     {
         public ProcessNewWorkflowTests()
@@ -121,14 +120,13 @@ public async Task NewWorkflowsThatFailToPostToCromwellAreMovedToFailedSubdirecto
             storageUtility
                 .Setup(x => x.GetStorageAccountsUsingMsiAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult((new List<IAzureStorage>(), azureStorage.Object)));
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
             var cromwellOnAzureEnvironment = new TriggerHostedService(
                 logger,
                 optionsMock.Object,
                 cromwellApiClient,
                 tesTaskRepository,
                 storageUtility.Object,
-                azureCloudConfig);
+                AzureCloudConfig.ForUnitTesting());
 
             await cromwellOnAzureEnvironment.ProcessAndAbortWorkflowsAsync();
 
@@ -209,15 +207,13 @@ public async Task NewWorkflowsThatFailToParseAsJsonAreAnotatedAndMovedToFailedSu
                 .Setup(x => x.GetStorageAccountsUsingMsiAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult((new List<IAzureStorage>(), azureStorage.Object)));
 
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
-
             var cromwellOnAzureEnvironment = new TriggerHostedService(
                 logger,
                 triggerServiceOptions.Object,
                 cromwellApiClient2,
                 tesTaskRepository,
                 storageUtility.Object,
-                azureCloudConfig);
+                AzureCloudConfig.ForUnitTesting());
 
             await cromwellOnAzureEnvironment.ProcessAndAbortWorkflowsAsync();
             Assert.IsTrue(newTriggerName.StartsWith("failed/"));

diff --git a/src/TriggerService.Tests/TriggerEngineTests.cs b/src/TriggerService.Tests/TriggerEngineTests.cs
@@ -101,8 +101,7 @@ public async Task TriggerEngineRunsAndOnlyLogsAvailabilityOncePerSystemUponAvail
                 .Setup(x => x.GetStorageAccountsUsingMsiAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult((new List<IAzureStorage>(), azureStorage.Object)));
 
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
-            var triggerHostedService = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, tesTaskRepository, storageUtility.Object, azureCloudConfig);
+            var triggerHostedService = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient, tesTaskRepository, storageUtility.Object, AzureCloudConfig.ForUnitTesting());
 
             //var engine = new TriggerHostedService(loggerFactory, environment.Object, TimeSpan.FromMilliseconds(25), TimeSpan.FromMilliseconds(25));
             _ = Task.Run(() => triggerHostedService.StartAsync(new System.Threading.CancellationToken()));

diff --git a/src/TriggerService.Tests/TriggerService.Tests.csproj b/src/TriggerService.Tests/TriggerService.Tests.csproj
@@ -25,8 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-    <ProjectReference Include="..\ga4gh-tes\src\Tes\Tes.csproj" />
     <ProjectReference Include="..\TriggerService\TriggerService.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/TriggerService.Tests/UpdateWorkflowStatusTests.cs b/src/TriggerService.Tests/UpdateWorkflowStatusTests.cs
@@ -21,7 +21,6 @@
 namespace TriggerService.Tests
 {
     [TestClass]
-    [Ignore]
     public class UpdateWorkflowStatusTests
     {
         public UpdateWorkflowStatusTests()
@@ -431,8 +430,7 @@ static string ShardString(int shard) =>
                 .Setup(x => x.GetStorageAccountsUsingMsiAsync(It.IsAny<string>()))
                 .Returns(Task.FromResult((new List<IAzureStorage>(), azureStorage.Object)));
 
-            var azureCloudConfig = AzureCloudConfig.FromKnownCloudNameAsync().Result;
-            var cromwellOnAzureEnvironment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient.Object, repository.Object, storageUtility.Object, azureCloudConfig);
+            var cromwellOnAzureEnvironment = new TriggerHostedService(logger, triggerServiceOptions.Object, cromwellApiClient.Object, repository.Object, storageUtility.Object, AzureCloudConfig.ForUnitTesting());
 
             await cromwellOnAzureEnvironment.UpdateWorkflowStatusesAsync();
 

diff --git a/src/ga4gh-tes b/src/ga4gh-tes
+1 −1		src/CommonUtilities.Tests/ArmEnvironmentEndpointsTests.cs
+29 −0		src/CommonUtilities/AzureCloudConfig.cs
+0 −15		src/CommonUtilities/ExpensiveObjectTestUtility.cs
+1 −1		src/Tes.ApiClients.Tests/TerraSamApiClientTests.cs
+1 −1		src/Tes.ApiClients.Tests/TerraWsmApiClientTests.cs
+1 −1		src/Tes.Runner.Test/Storage/ArmUrlTransformationStrategyTests.cs
+1 −1		src/TesApi.Tests/PriceApiBatchSkuInformationProviderTests.cs
+1 −1		src/TesApi.Tests/Runner/TaskToNodeTaskConverterTests.cs
+1 −1		src/TesApi.Tests/StartupTests.cs
+1 −1		src/TesApi.Tests/Storage/DefaultStorageAccessProviderTests.cs
+1 −1		src/TesApi.Tests/TerraStorageAccessProviderTests.cs
+1 −1		src/TesApi.Tests/TestServices/TestServiceProvider.cs
+1 −1		src/deploy-tes-on-azure.Tests/KubernetesManagerTests.cs