RUBY-2799 Use shared EventSubscriber in specs (#2340)

comandeo-mongo · web-flow · commit 896da8d82b1e · 2021-09-02T10:41:55.000+02:00
diff --git a/spec/integration/bulk_write_spec.rb b/spec/integration/bulk_write_spec.rb
@@ -21,7 +21,7 @@
   end
 
   context 'when bulk write needs to be split' do
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:max_bson_size) { Mongo::Server::ConnectionBase::DEFAULT_MAX_BSON_OBJECT_SIZE }
 
diff --git a/spec/integration/change_stream_spec.rb b/spec/integration/change_stream_spec.rb
@@ -53,7 +53,7 @@ def clear_fail_point_before
       it 'raises an exception and does not attempt to resume' do
         change_stream
 
-        subscriber = EventSubscriber.new
+        subscriber = Mrss::EventSubscriber.new
         authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
 
         expect do
@@ -523,7 +523,7 @@ def clear_fail_point_before
     let(:events) do
       start_after
 
-      subscriber = EventSubscriber.new
+      subscriber = Mrss::EventSubscriber.new
       authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
       use_stream
 
@@ -582,7 +582,7 @@ def clear_fail_point_before
     let(:stream) { authorized_collection.watch }
 
     let(:events) do
-      subscriber = EventSubscriber.new
+      subscriber = Mrss::EventSubscriber.new
       authorized_client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
       use_stream
       subscriber.succeeded_events.select { |e|
diff --git a/spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb b/spec/integration/client_side_encryption/auto_encryption_bulk_writes_spec.rb
@@ -11,7 +11,7 @@
   include_context 'define shared FLE helpers'
   include_context 'with local kms_providers'
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     new_local_client(
diff --git a/spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb b/spec/integration/client_side_encryption/auto_encryption_command_monitoring_spec.rb
@@ -15,7 +15,7 @@
   include_context 'define shared FLE helpers'
   include_context 'with local kms_providers'
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
   let(:db_name) { 'auto_encryption' }
 
   let(:encryption_client) do
diff --git a/spec/integration/client_side_encryption/bson_size_limit_spec.rb b/spec/integration/client_side_encryption/bson_size_limit_spec.rb
@@ -11,7 +11,7 @@
 
     include_context 'define shared FLE helpers'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:client) do
       authorized_client.use('db')
diff --git a/spec/integration/client_side_encryption/data_key_spec.rb b/spec/integration/client_side_encryption/data_key_spec.rb
@@ -11,7 +11,7 @@
 
     include_context 'define shared FLE helpers'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:client) do
       new_local_client(
diff --git a/spec/integration/command_monitoring_spec.rb b/spec/integration/command_monitoring_spec.rb
@@ -5,7 +5,7 @@
 
 describe 'Command monitoring' do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.with(app_name: 'command monitoring spec').tap do |client|
diff --git a/spec/integration/command_spec.rb b/spec/integration/command_spec.rb
@@ -5,7 +5,7 @@
 
 describe 'Command' do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   describe 'payload' do
     let(:server) { authorized_client.cluster.next_primary }
diff --git a/spec/integration/connection_spec.rb b/spec/integration/connection_spec.rb
@@ -50,7 +50,7 @@
 
       context 'with sdam event subscription' do
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
         let(:client) do
           ClientRegistry.instance.global_client('authorized').with(app_name: 'connection_integration').tap do |client|
             client.subscribe(Mongo::Monitoring::SERVER_OPENING, subscriber)
diff --git a/spec/integration/cursor_reaping_spec.rb b/spec/integration/cursor_reaping_spec.rb
@@ -21,7 +21,7 @@
   end
 =end
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/integration/get_more_spec.rb b/spec/integration/get_more_spec.rb
@@ -7,7 +7,7 @@
   # https://jira.mongodb.org/browse/RUBY-1987
   min_server_fcv '3.2'
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/integration/heartbeat_events_spec.rb b/spec/integration/heartbeat_events_spec.rb
@@ -11,7 +11,7 @@ class HeartbeatEventsSpecTestException < StandardError; end
 
   clean_slate_for_all
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   before do
     Mongo::Monitoring::Global.subscribe(Mongo::Monitoring::SERVER_HEARTBEAT, subscriber)
diff --git a/spec/integration/map_reduce_spec.rb b/spec/integration/map_reduce_spec.rb
@@ -7,7 +7,7 @@
   let(:client) { authorized_client }
   let(:collection) { client['mr_integration'] }
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:find_options) { {} }
 
diff --git a/spec/integration/query_cache_spec.rb b/spec/integration/query_cache_spec.rb
@@ -28,7 +28,7 @@
     SessionRegistry.instance.verify_sessions_ended!
   end
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/integration/query_cache_transactions_spec.rb b/spec/integration/query_cache_transactions_spec.rb
@@ -23,7 +23,7 @@
   # leak sessions independently of the query cache. This will be resolved by
   # RUBY-2391.
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/integration/read_concern_spec.rb b/spec/integration/read_concern_spec.rb
@@ -7,7 +7,7 @@
   min_server_version '3.2'
 
   let(:subscriber) do
-    EventSubscriber.new
+    Mrss::EventSubscriber.new
   end
 
   let(:specified_read_concern) do
diff --git a/spec/integration/read_preference_spec.rb b/spec/integration/read_preference_spec.rb
@@ -16,7 +16,7 @@
     authorized_client.with(client_options)
   end
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   before do
     client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
diff --git a/spec/integration/retryable_errors_spec.rb b/spec/integration/retryable_errors_spec.rb
@@ -7,7 +7,7 @@
   # Requirement for fail point
   min_server_fcv '4.0'
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client_options) do
     {}
diff --git a/spec/integration/sdam_error_handling_spec.rb b/spec/integration/sdam_error_handling_spec.rb
@@ -18,7 +18,7 @@
   # shard cluster where multiple servers are equally eligible
   require_no_multi_mongos
 
-  let(:diagnostic_subscriber) { VerboseEventSubscriber.new }
+  let(:diagnostic_subscriber) { Mrss::VerboseEventSubscriber.new }
 
   let(:client) do
     new_local_client(SpecConfig.instance.addresses,
@@ -290,7 +290,7 @@
   describe 'when there is an error on monitoring connection' do
     clean_slate_for_all
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:set_subscribers) do
       client.subscribe(Mongo::Monitoring::SERVER_DESCRIPTION_CHANGED, subscriber)
diff --git a/spec/integration/sdam_events_spec.rb b/spec/integration/sdam_events_spec.rb
@@ -4,7 +4,7 @@
 require 'spec_helper'
 
 describe 'SDAM events' do
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   describe 'server closed event' do
     it 'is published when client is closed' do
diff --git a/spec/integration/sdam_prose_spec.rb b/spec/integration/sdam_prose_spec.rb
@@ -11,7 +11,7 @@
     min_server_fcv '4.4'
     require_topology :single
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:client) do
       new_local_client(SpecConfig.instance.addresses,
diff --git a/spec/integration/step_down_spec.rb b/spec/integration/step_down_spec.rb
@@ -32,7 +32,7 @@
     end
   end
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:test_client) do
     authorized_client_without_any_retries.with(server_selection_timeout: 20).tap do |client|
diff --git a/spec/integration/x509_auth_spec.rb b/spec/integration/x509_auth_spec.rb
@@ -38,7 +38,7 @@
       "C=US,ST=New York,L=New York City,O=MongoDB,OU=x509,CN=localhost".freeze
     end
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     shared_examples 'authenticates successfully' do
       it 'authenticates successfully' do
diff --git a/spec/lite_spec_helper.rb b/spec/lite_spec_helper.rb
@@ -77,7 +77,7 @@ module Mrss
 
 require 'mrss/lite_constraints'
 require 'support/matchers'
-require 'support/event_subscriber'
+require 'mrss/event_subscriber'
 require 'support/common_shortcuts'
 require 'support/client_registry'
 require 'support/client_registry_macros'
diff --git a/spec/mongo/auth/user/view_spec.rb b/spec/mongo/auth/user/view_spec.rb
@@ -23,7 +23,7 @@
   shared_context 'testing write concern' do
 
     let(:subscriber) do
-      EventSubscriber.new
+      Mrss::EventSubscriber.new
     end
 
     let(:client) do
diff --git a/spec/mongo/bulk_write_spec.rb b/spec/mongo/bulk_write_spec.rb
@@ -2106,7 +2106,7 @@
             require_no_multi_mongos
 
 
-            let(:subscriber) { EventSubscriber.new }
+            let(:subscriber) { Mrss::EventSubscriber.new }
 
             let(:client) do
               authorized_client_with_retry_writes.tap do |client|
diff --git a/spec/mongo/client_construction_spec.rb b/spec/mongo/client_construction_spec.rb
@@ -6,7 +6,7 @@
 describe Mongo::Client do
   clean_slate
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   describe '.new' do
     context 'with scan: false' do
diff --git a/spec/mongo/client_spec.rb b/spec/mongo/client_spec.rb
@@ -635,7 +635,7 @@
         root_authorized_client.options.merge(heartbeat_frequency: 100, monitoring: true)
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         ClientRegistry.instance.new_local_client(
diff --git a/spec/mongo/cluster_spec.rb b/spec/mongo/cluster_spec.rb
@@ -362,7 +362,7 @@
       end
 
       let(:monitoring) { Mongo::Monitoring.new }
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       it 'publishes server closed event once' do
         monitoring.subscribe(Mongo::Monitoring::SERVER_CLOSED, subscriber)
diff --git a/spec/mongo/collection/view/aggregation_spec.rb b/spec/mongo/collection/view/aggregation_spec.rb
@@ -235,7 +235,7 @@
         { session: session }
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
diff --git a/spec/mongo/collection/view/map_reduce_spec.rb b/spec/mongo/collection/view/map_reduce_spec.rb
@@ -242,7 +242,7 @@
             Mongo::Collection::View.new(client[TEST_COLL], selector, view_options)
           end
 
-          let(:subscriber) { EventSubscriber.new }
+          let(:subscriber) { Mrss::EventSubscriber.new }
 
           let(:client) do
             authorized_client.tap do |client|
diff --git a/spec/mongo/collection_crud_spec.rb b/spec/mongo/collection_crud_spec.rb
@@ -5,7 +5,7 @@
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/mongo/collection_ddl_spec.rb b/spec/mongo/collection_ddl_spec.rb
@@ -5,7 +5,7 @@
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/mongo/collection_spec.rb b/spec/mongo/collection_spec.rb
@@ -5,7 +5,7 @@
 
 describe Mongo::Collection do
 
-  let(:subscriber) { EventSubscriber.new }
+  let(:subscriber) { Mrss::EventSubscriber.new }
 
   let(:client) do
     authorized_client.tap do |client|
diff --git a/spec/mongo/cursor_spec.rb b/spec/mongo/cursor_spec.rb
@@ -438,7 +438,7 @@
   context 'when an implicit session is used' do
     min_server_fcv '3.6'
 
-    let(:subscriber) { EventSubscriber.new }
+    let(:subscriber) { Mrss::EventSubscriber.new }
 
     let(:subscribed_client) do
       authorized_client.tap do |client|
diff --git a/spec/mongo/database_spec.rb b/spec/mongo/database_spec.rb
@@ -218,7 +218,7 @@
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -391,7 +391,7 @@
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -583,7 +583,7 @@
           described_class.new(client, SpecConfig.instance.test_db)
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           authorized_client.tap do |client|
@@ -678,7 +678,7 @@
         client.start_session
       end
 
-      let(:subscriber) { EventSubscriber.new }
+      let(:subscriber) { Mrss::EventSubscriber.new }
 
       let(:client) do
         authorized_client.tap do |client|
@@ -969,7 +969,7 @@
           client.start_session
         end
 
-        let(:subscriber) { EventSubscriber.new }
+        let(:subscriber) { Mrss::EventSubscriber.new }
 
         let(:client) do
           root_authorized_client.tap do |client|
diff --git a/spec/mongo/index/view_spec.rb b/spec/mongo/index/view_spec.rb
diff --git a/spec/mongo/query_cache_spec.rb b/spec/mongo/query_cache_spec.rb
diff --git a/spec/mongo/server/connection_pool_spec.rb b/spec/mongo/server/connection_pool_spec.rb
diff --git a/spec/mongo/session/session_pool_spec.rb b/spec/mongo/session/session_pool_spec.rb
diff --git a/spec/runners/change_streams/test.rb b/spec/runners/change_streams/test.rb
diff --git a/spec/runners/cmap.rb b/spec/runners/cmap.rb
diff --git a/spec/runners/crud.rb b/spec/runners/crud.rb
diff --git a/spec/runners/transactions/test.rb b/spec/runners/transactions/test.rb
diff --git a/spec/runners/unified/event_subscriber.rb b/spec/runners/unified/event_subscriber.rb
diff --git a/spec/shared b/spec/shared
diff --git a/spec/spec_tests/cmap_spec.rb b/spec/spec_tests/cmap_spec.rb
diff --git a/spec/spec_tests/command_monitoring_spec.rb b/spec/spec_tests/command_monitoring_spec.rb
diff --git a/spec/spec_tests/sdam_monitoring_spec.rb b/spec/spec_tests/sdam_monitoring_spec.rb
diff --git a/spec/support/event_subscriber.rb b/spec/support/event_subscriber.rb
diff --git a/spec/support/shared/session.rb b/spec/support/shared/session.rb
diff --git a/spec/support/utils.rb b/spec/support/utils.rb
