Merge branch 'acunskis-fix-user-deletion' into 'master'

E2E: Move user deletion to ensure block in migration specs

See merge request gitlab-org/gitlab!81100

qa/qa/specs/features/api/1_manage/migration/gitlab_migration_group_spec.rb

@@ -55,9 +55,9 @@ module QA
 
       after do |example|
         # Checking for failures in the test currently makes test very flaky due to catching unrelated failures
-        # Just log in case of failure until cause of network errors is found
-        # See: https://gitlab.com/gitlab-org/gitlab/-/issues/346500
-        Runtime::Logger.warn(import_failures) if example.exception && !import_failures.empty?
+        # Log failures for easier debugging
+        Runtime::Logger.warn("Import failures: #{import_failures}") if example.exception && !import_failures.empty?
+      ensure
         user.remove_via_api!
       end
 

qa/qa/specs/features/api/1_manage/migration/gitlab_project_migration_common.rb

@@ -75,13 +75,13 @@ def expect_import_finished
     end
 
     after do |example|
-      # Checking for failures in the test currently makes test very flaky
-      # Just log in case of failure until cause of network errors is found
+      # Checking for failures in the test currently makes test very flaky due to catching unrelated failures
+      # Log failures for easier debugging
       Runtime::Logger.warn("Import failures: #{import_failures}") if example.exception && !import_failures.empty?
-
-      user.remove_via_api!
     ensure
       Runtime::Feature.disable(:bulk_import_projects)
+
+      user.remove_via_api!
     end
   end
 end

qa/qa/specs/features/ee/api/1_manage/gitlab_migration_group_spec.rb

@@ -109,10 +109,9 @@ def find_epic(epics, title)
 
       after do |example|
         # Checking for failures in the test currently makes test very flaky due to catching unrelated failures
-        # Just log in case of failure until cause of network errors is found
-        # See: https://gitlab.com/gitlab-org/gitlab/-/issues/346500
-        Runtime::Logger.warn(import_failures) if example.exception && !import_failures.empty?
-
+        # Log failures for easier debugging
+        Runtime::Logger.warn("Import failures: #{import_failures}") if example.exception && !import_failures.empty?
+      ensure
         user.remove_via_api!
         author.remove_via_api!
       end