tests(Compute): Adjust concurrent retries.

GoogleCloudPlatform · Sep 9, 2021 · adbd40e · adbd40e
1 parent d229288
commit adbd40e
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/compute/api/Compute.Samples.Tests/ComputeFixture.cs b/compute/api/Compute.Samples.Tests/ComputeFixture.cs
@@ -54,7 +54,14 @@ public class ComputeFixture : IDisposable, ICollectionFixture<ComputeFixture>
 
         private StorageClient StorageClient { get; } = StorageClient.Create();
 
-        public RetryRobot Assert { get; } = new RetryRobot { RetryWhenExceptions = new Type[] { typeof(XunitException) } };
+        public RetryRobot AssertConcurrently { get; } = new RetryRobot
+        { 
+            RetryWhenExceptions = new Type[] { typeof(XunitException) },
+            // We wait a little longer than default to let the concurrent test execution
+            // finish before reattempting.
+            FirstRetryDelayMs = 30_000,
+            MaxTryCount = 10
+        };
 
         public ComputeFixture()
         {

diff --git a/compute/api/Compute.Samples.Tests/DisableUsageExportBucketAsyncTest.cs b/compute/api/Compute.Samples.Tests/DisableUsageExportBucketAsyncTest.cs
@@ -30,7 +30,7 @@ public class DisableUsageExportBucketAsyncTest
         [Fact]
         public async Task DisablesUsageExportBucket()
         {
-            await _fixture.Assert.Eventually(async () =>
+            await _fixture.AssertConcurrently.Eventually(async () =>
             {
                 await _sample.DisableUsageExportBucketAsync(_fixture.ProjectId);
 

diff --git a/compute/api/Compute.Samples.Tests/SetUsageExportBucketAsyncTest.cs b/compute/api/Compute.Samples.Tests/SetUsageExportBucketAsyncTest.cs
@@ -30,7 +30,7 @@ public class SetUsageExportBucketAsyncTest
         [Fact]
         public async Task SetsUsageExportBucket()
         {
-            await _fixture.Assert.Eventually(async () =>
+            await _fixture.AssertConcurrently.Eventually(async () =>
             {
                 await _sample.SetUsageExportBucketAsync(_fixture.ProjectId, _fixture.UsageReportBucketName, _fixture.UsageReportPrefix);