Skip to content

A platform for community discussion. Free, open, simple.

DEV: Fix intermittent hang in the multisite backup creator spec (#44968)

David Taylor0deb1e956072
diff --git a/spec/multisite/backup_creator_spec.rb b/spec/multisite/backup_creator_spec.rb
index 633364451c0..c16a17a121c 100644
--- a/spec/multisite/backup_creator_spec.rb
+++ b/spec/multisite/backup_creator_spec.rb
@@ -14,7 +14,10 @@ RSpec.describe BackupRestore::Creator, type: :multisite do
observations << [group, Thread.current, RailsMultisite::ConnectionManagement.current_db]
end
- Timeout.timeout(10) { creator.send(:download_upload_groups, [1, 2]) }
+ # Workers opening a new site connection at once deadlock the test transaction setup.
+ RailsMultisite::ConnectionManagement.with_connection(database) do
+ Timeout.timeout(10) { creator.send(:download_upload_groups, [1, 2]) }
+ end
results = 2.times.map { observations.pop }
expect(results.map(&:first).sort).to eq([1, 2])