[PM-25056] - Deadlock testing fix

test/Infrastructure.IntegrationTest/AdminConsole/OrganizationTestHelpers.cs

@@ -4,6 +4,8 @@
 using Bit.Core.Entities;
 using Bit.Core.Enums;
 using Bit.Core.Repositories;
+using Bit.Core.Utilities;
+using Microsoft.Data.SqlClient;
 
 namespace Bit.Infrastructure.IntegrationTest.AdminConsole;
 
@@ -16,7 +18,7 @@ public static class OrganizationTestHelpers
 {
     public static Task<User> CreateTestUserAsync(this IUserRepository userRepository, string identifier = "test")
     {
-        var id = Guid.NewGuid();
+        var id = CoreHelpers.GenerateComb();
         return userRepository.CreateAsync(new User
         {
             Id = id,
@@ -34,7 +36,7 @@ public static Task<Organization> CreateTestOrganizationAsync(this IOrganizationR
         int? seatCount = null,
         string identifier = "test")
     {
-        var id = Guid.NewGuid();
+        var id = CoreHelpers.GenerateComb();
         return organizationRepository.CreateAsync(new Organization
         {
             Name = $"{identifier}-{id}",
@@ -181,6 +183,41 @@ public static Task<Collection> CreateTestCollectionAsync(
             Name = $"{identifier} {Guid.NewGuid()}"
         });
 
+    /// <summary>
+    /// Deletes an organization with retry logic for SQL Server deadlocks (error 1205).
+    /// Use this instead of <see cref="IOrganizationRepository.DeleteAsync"/> in test cleanup
+    /// to avoid deadlocks when tests run in parallel.
+    /// </summary>
+    public static async Task SafeDeleteAsync(this IOrganizationRepository repo, Organization org, int maxRetries = 3)
+    {
+        for (var attempt = 0; ; attempt++)
+        {
+            try
+            {
+                await repo.DeleteAsync(org);
+                return;
+            }
+            catch (Exception ex) when (attempt < maxRetries && IsDeadlock(ex))
+            {
+                await Task.Delay(Random.Shared.Next(50, 200));
+            }
+        }
+    }
+
+    private static bool IsDeadlock(Exception ex)
+    {
+        var current = ex;
+        while (current != null)
+        {
+            if (current is SqlException { Number: 1205 })
+            {
+                return true;
+            }
+            current = current.InnerException;
+        }
+        return false;
+    }
+
     public static Task<OrganizationInviteLink> CreateTestOrganizationInviteLinkAsync(
         this IOrganizationInviteLinkRepository repository,
         Organization organization,

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryCreateTests.cs

@@ -65,7 +65,7 @@ await collectionRepository.CreateAsync(collection,
         // Clean up data
         await userRepository.DeleteAsync(user1);
         await userRepository.DeleteAsync(user2);
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await groupRepository.DeleteManyAsync([group1.Id, group2.Id]);
         await organizationUserRepository.DeleteManyAsync([orgUser1.Id, orgUser2.Id]);
     }
@@ -100,6 +100,6 @@ public async Task CreateAsync_WithNoAccess_Works(
         Assert.Empty(actualAccess.Users);
 
         // Clean up
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
     }
 }

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CollectionRepositoryReplaceTests.cs

@@ -92,7 +92,7 @@ await collectionRepository.ReplaceAsync(collection,
         await userRepository.DeleteAsync(user1);
         await userRepository.DeleteAsync(user2);
         await userRepository.DeleteAsync(user3);
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
     }
 
     /// <remarks>
@@ -144,7 +144,7 @@ await collectionRepository.CreateAsync(collection,
 
         // Clean up
         await userRepository.DeleteAsync(user);
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
     }
 
     [Theory, DatabaseData]
@@ -209,6 +209,6 @@ await collectionRepository.CreateAsync(collection,
         // Clean up data
         await userRepository.DeleteAsync(user1);
         await userRepository.DeleteAsync(user2);
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
     }
 }

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/CollectionRepository/CreateDefaultCollectionsSharedTests.cs

@@ -147,7 +147,7 @@ private static async Task CleanupAsync(IOrganizationRepository organizationRepos
         Organization organization,
         IEnumerable<OrganizationUser> organizationUsers)
     {
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
 
         await userRepository.DeleteManyAsync(
             organizationUsers

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationRepositoryTests.cs

@@ -38,8 +38,8 @@
         Assert.Contains(result, org => org.Id == organization2.Id);
 
         // Clean up
-        await organizationRepository.DeleteAsync(organization1);
-        await organizationRepository.DeleteAsync(organization2);
+        await organizationRepository.SafeDeleteAsync(organization1);
+        await organizationRepository.SafeDeleteAsync(organization2);
     }
 
     [Theory, DatabaseData]
@@ -211,10 +211,10 @@
         Assert.NotNull(updateResult);
         Assert.Equal(organization.Id, updateResult.Id);
         Assert.True(updateResult.SyncSeats);
         Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss"));
 
         // Annul
-        await sutRepository.DeleteAsync(organization);
+        await sutRepository.SafeDeleteAsync(organization);
     }
 
     [DatabaseData, Theory]
@@ -236,10 +236,10 @@
         Assert.NotNull(updateResult);
         Assert.Equal(organization.Id, updateResult.Id);
         Assert.True(updateResult.SyncSeats);
         Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss"));
 
         // Annul
-        await sutRepository.DeleteAsync(organization);
+        await sutRepository.SafeDeleteAsync(organization);
     }
 
     [DatabaseData, Theory]
@@ -259,10 +259,10 @@
         Assert.NotNull(updateResult);
         Assert.Equal(organization.Id, updateResult.Id);
         Assert.True(updateResult.SyncSeats);
         Assert.Equal(requestDate.ToString("yyyy-MM-dd HH:mm:ss"), updateResult.RevisionDate.ToString("yyyy-MM-dd HH:mm:ss"));
 
         // Annul
-        await sutRepository.DeleteAsync(organization);
+        await sutRepository.SafeDeleteAsync(organization);
     }
 
     [DatabaseData, Theory]
@@ -283,7 +283,7 @@
         Assert.Null(result.FirstOrDefault(x => x.Id == organization.Id));
 
         // Annul
-        await sutRepository.DeleteAsync(organization);
+        await sutRepository.SafeDeleteAsync(organization);
     }
 
     [DatabaseTheory, DatabaseData]
@@ -402,7 +402,7 @@
         Assert.Equal(organization.UseMyItems, result.UseMyItems);
 
         // Clean up
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
     }
 
     [Theory, DatabaseData]

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/GetManyConfirmedAcceptedDetailsByUserAsyncTests.cs

@@ -28,7 +28,7 @@ public async Task ReturnsDetails_WhenUserIsConfirmed(
         Assert.Equal(OrganizationUserStatusType.Confirmed, result.Status);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -54,7 +54,7 @@ public async Task ReturnsDetails_WhenUserIsAccepted(
         Assert.Equal(OrganizationUserStatusType.Accepted, result.Status);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -82,8 +82,8 @@ public async Task ReturnsDetailsAcrossMultipleOrganizations_WhenUserIsConfirmedO
         Assert.Contains(results, r => r.OrganizationId == acceptedOrg.Id && r.Status == OrganizationUserStatusType.Accepted);
 
         // Annul
-        await organizationRepository.DeleteAsync(confirmedOrg);
-        await organizationRepository.DeleteAsync(acceptedOrg);
+        await organizationRepository.SafeDeleteAsync(confirmedOrg);
+        await organizationRepository.SafeDeleteAsync(acceptedOrg);
         await userRepository.DeleteAsync(user);
     }
 
@@ -105,7 +105,7 @@ public async Task DoesNotReturnDetails_WhenUserIsInvited(
         Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -127,7 +127,7 @@ public async Task DoesNotReturnDetails_WhenUserIsRevoked(
         Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -151,7 +151,7 @@ public async Task DoesNotReturnDetails_ForOtherUsers(
         Assert.DoesNotContain(results, r => r.OrganizationId == organization.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteManyAsync([targetUser, otherUser]);
     }
 }

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs

@@ -1395,7 +1395,7 @@ public async Task ConfirmOrganizationUserAsync_WhenUserIsAccepted_ReturnsTrue(IO
         Assert.Equal(key, updatedUser.Key);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -1428,7 +1428,7 @@ public async Task ConfirmOrganizationUserAsync_WhenUserIsAlreadyConfirmed_Return
         Assert.Equal(OrganizationUserStatusType.Confirmed, unchangedUser.Status);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -1462,7 +1462,7 @@ public async Task ConfirmOrganizationUserAsync_IsIdempotent_WhenCalledMultipleTi
         Assert.Equal(OrganizationUserStatusType.Confirmed, finalUser.Status);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetManyConfirmedAcceptedByUserIdAsyncTests.cs

@@ -35,7 +35,7 @@ public async Task ReturnsPolicies_WhenUserIsConfirmed(
         Assert.Contains(results, p => p.Id == policy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -64,7 +64,7 @@ public async Task ReturnsPolicies_WhenUserIsAccepted(
         Assert.Contains(results, p => p.Id == policy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -104,8 +104,8 @@ public async Task ReturnsPoliciesAcrossMultipleOrganizations_WhenUserIsConfirmed
         Assert.Contains(results, p => p.Id == acceptedPolicy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(confirmedOrg);
-        await organizationRepository.DeleteAsync(acceptedOrg);
+        await organizationRepository.SafeDeleteAsync(confirmedOrg);
+        await organizationRepository.SafeDeleteAsync(acceptedOrg);
         await userRepository.DeleteAsync(user);
     }
 
@@ -141,7 +141,7 @@ await organizationUserRepository.CreateAsync(new OrganizationUser
         Assert.DoesNotContain(results, p => p.Id == policy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -170,7 +170,7 @@ public async Task DoesNotReturnPolicies_WhenUserIsRevoked(
         Assert.DoesNotContain(results, p => p.Id == policy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteAsync(user);
     }
 
@@ -201,7 +201,7 @@ public async Task DoesNotReturnPolicies_ForOtherUsers(
         Assert.DoesNotContain(results, p => p.Id == policy.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteManyAsync([targetUser, otherUser]);
     }
 }

test/Infrastructure.IntegrationTest/AdminConsole/Repositories/PolicyRepository/GetPolicyDetailsByOrganizationIdAsyncTests.cs

@@ -41,7 +41,7 @@ public async Task ShouldContainProviderData(
         Assert.True(results.Single().IsProvider);
 
         // Annul
-        await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
         await userRepository.DeleteAsync(user);
 
         async Task ArrangeProvider()
@@ -92,8 +92,8 @@ public async Task ShouldNotReturnOtherOrganizations_WhenUserIsNotConnected(
         Assert.DoesNotContain(results, result => result.OrganizationId == notConnectedOrg.Id);
 
         // Annul
-        await organizationRepository.DeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
-        await organizationRepository.DeleteAsync(notConnectedOrg);
+        await organizationRepository.SafeDeleteAsync(new Organization { Id = userOrgConnectedDirectly.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(notConnectedOrg);
         await userRepository.DeleteAsync(user);
     }
 
@@ -126,7 +126,7 @@ public async Task ShouldOnlyReturnInputPolicyType(
         Assert.DoesNotContain(results, result => result.PolicyType == notInputPolicyType);
 
         // Annul
-        await organizationRepository.DeleteAsync(new Organization { Id = orgUser.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization { Id = orgUser.OrganizationId });
         await userRepository.DeleteAsync(user);
     }
 
@@ -158,9 +158,9 @@ public async Task WhenDirectlyConnectedUserHasUserId_ShouldReturnOtherConnectedO
         AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId);
 
         // Annul
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
         await userRepository.DeleteAsync(user);
     }
 
@@ -188,9 +188,9 @@ public async Task WhenDirectlyConnectedUserHasEmail_ShouldReturnOtherConnectedOr
         AssertPolicyDetailUserConnections(results, userOrgConnectedDirectly, userOrgConnectedByEmail, userOrgConnectedByUserId);
 
         // Annul
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
-        await organizationRepository.DeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedDirectly.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedByEmail.OrganizationId });
+        await organizationRepository.SafeDeleteAsync(new Organization() { Id = userOrgConnectedByUserId.OrganizationId });
         await userRepository.DeleteAsync(user);
     }
 
@@ -227,7 +227,7 @@ public async Task ShouldReturnUserIds(
                                            && result.OrganizationId == orgUser2.OrganizationId);
 
         // Annul
-        await organizationRepository.DeleteAsync(organization);
+        await organizationRepository.SafeDeleteAsync(organization);
         await userRepository.DeleteManyAsync([user1, user2]);
     }