RUBY-2820 use session registry from mrss (#5173)

* RUBY-2820 use mrss session_registry * RUBY-2820 include old session registry * RUBY-2820 update version check * remove unnecessary spacing
mongodb · Jul 19, 2022 · d277173 · d277173
1 parent 5d80e8e
commit d277173
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 54 deletions.
diff --git a/spec/lite_spec_helper.rb b/spec/lite_spec_helper.rb
@@ -19,7 +19,14 @@
 
 require 'support/spec_config'
 require 'mrss/lite_constraints'
-require "support/session_registry"
+
+if Gem::Version.new(Mongo::VERSION) < Gem::Version.new('2.18.0.alpha')
+  require "mrss/session_registry_legacy"
+else
+  require "mrss/session_registry"
+end
+
+Mrss.patch_mongo_for_session_registry
 
 unless SpecConfig.instance.ci?
   begin

diff --git a/spec/mongoid/query_cache_spec.rb b/spec/mongoid/query_cache_spec.rb
@@ -17,11 +17,11 @@
     # occur only within the scope of these tests.
     #
     # Other session leaks will be detected and addressed as part of RUBY-2391.
-    SessionRegistry.instance.clear_registry
+    Mrss::SessionRegistry.instance.clear_registry
   end
 
   after do
-    SessionRegistry.instance.verify_sessions_ended!
+    Mrss::SessionRegistry.instance.verify_sessions_ended!
   end
 
   let(:reset_legacy_qc_warning) do

diff --git a/spec/shared b/spec/shared
diff --git a/spec/support/session_registry.rb b/spec/support/session_registry.rb
+69 −0		lib/mrss/session_registry.rb
+60 −0		lib/mrss/session_registry_legacy.rb