mongo 2.15.0 → 2.16.1

data/spec/support/spec_config.rb

@@ -13,9 +13,12 @@ class SpecConfig
     @uri_options = {}
     @ruby_options = {}
     if ENV['MONGODB_URI']
-      @mongodb_uri = Mongo::URI.new(ENV['MONGODB_URI'])
+      @mongodb_uri = Mongo::URI.get(ENV['MONGODB_URI'])
       @uri_options = Mongo::Options::Mapper.transform_keys_to_symbols(@mongodb_uri.uri_options)
-      if @uri_options[:replica_set]
+      if ENV['TOPOLOGY'] == 'load-balanced'
+        @addresses = @mongodb_uri.servers
+        @connect_options = { connect: :load_balanced }
+      elsif @uri_options[:replica_set]
         @addresses = @mongodb_uri.servers
         @connect_options = { connect: :replica_set, replica_set: @uri_options[:replica_set] }
       elsif @uri_options[:connect] == :sharded || ENV['TOPOLOGY'] == 'sharded-cluster'
@@ -30,15 +33,6 @@ class SpecConfig
       else
         @ssl = @uri_options[:ssl]
       end
-    elsif ENV['MONGODB_ADDRESSES']
-      @addresses = ENV['MONGODB_ADDRESSES'] ? ENV['MONGODB_ADDRESSES'].split(',').freeze : [ '127.0.0.1:27017' ].freeze
-      if ENV['RS_ENABLED']
-        @connect_options = { connect: :replica_set, replica_set: ENV['RS_NAME'] }
-      elsif ENV['SHARDED_ENABLED']
-        @connect_options = { connect: :sharded }
-      else
-        @connect_options = { connect: :direct }
-      end
     end
 
     @uri_tls_options = {}
@@ -634,4 +628,9 @@ EOT
       creds
     end
   end
+
+  # Returns whether the test suite was configured with a single mongos.
+  def single_mongos?
+    %w(1 true yes).include?(ENV['SINGLE_MONGOS'])
+  end
 end

data/spec/support/using_hash.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
+class UsingHash < Hash
+  def use(key)
+    wrap(self[key]).tap do
+      delete(key)
+    end
+  end
+
+  def use!(key)
+    wrap(fetch(key)).tap do
+      delete(key)
+    end
+  end
+
+  private
+
+  def wrap(v)
+    case v
+    when Hash
+      self.class[v]
+    when Array
+      v.map do |subv|
+        wrap(subv)
+      end
+    else
+      v
+    end
+  end
+end

data/spec/support/utils.rb

@@ -556,7 +556,7 @@ module Utils
   # command event published, asserts the command event published has the
   # specified command name, and returns the published event.
   module_function def get_command_event(client, command_name, include_auth: false)
-    subscriber = EventSubscriber.new
+    subscriber = Mrss::EventSubscriber.new
     client.subscribe(Mongo::Monitoring::COMMAND, subscriber)
     begin
       yield client