mongo 2.15.0.alpha → 2.15.0

data/spec/support/client_registry.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'singleton'
 
 module Mongo
@@ -85,7 +88,7 @@ class ClientRegistry
 
   def new_global_client(name)
     case name
-    # Provides a basic scanned client to do an ismaster check.
+    # Provides a basic scanned client to do a hello check.
     when 'basic'
       Mongo::Client.new(
         SpecConfig.instance.addresses,
@@ -188,10 +191,14 @@ class ClientRegistry
   end
   private :new_global_client
 
-  def new_local_client(*args)
-    Mongo::Client.new(*args).tap do |client|
-      @lock.synchronize do
-        @local_clients << client
+  def new_local_client(*args, &block)
+    if block_given?
+      Mongo::Client.new(*args, &block)
+    else
+      Mongo::Client.new(*args).tap do |client|
+        @lock.synchronize do
+          @local_clients << client
+        end
       end
     end
   end

data/spec/support/client_registry_macros.rb

@@ -1,9 +1,12 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module ClientRegistryMacros
-  def new_local_client(address, options=nil)
-    ClientRegistry.instance.new_local_client(address, options)
+  def new_local_client(address, options=nil, &block)
+    ClientRegistry.instance.new_local_client(address, options, &block)
   end
 
-  def new_local_client_nmio(address, options=nil)
+  def new_local_client_nmio(address, options=nil, &block)
     # Avoid type converting options.
     base_options = {monitoring_io: false}
     if BSON::Document === options || options&.keys&.any? { |key| String === key }
@@ -14,7 +17,7 @@ module ClientRegistryMacros
     else
       base_options
     end
-    new_local_client(address, options)
+    new_local_client(address, options, &block)
   end
 
   def close_local_clients

data/spec/support/cluster_tools.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'singleton'
 
 # There is an undocumented {replSetStepUp: 1} command which can be used to
@@ -118,7 +121,7 @@ class ClusterTools
       rescue Mongo::Error::OperationFailure => e
         # Election failed. (125)
         if e.code == 125
-          # Possible reason is the node we are trying to elect has blacklisted
+          # Possible reason is the node we are trying to elect has deny-listed
           # itself. This is where {replSetFreeze: 0} should make it eligible
           # for election again but this seems to not always work.
         else

data/spec/support/common_shortcuts.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module CommonShortcuts
   module ClassMethods
     # Declares a topology double, which is configured to accept summary
@@ -153,6 +156,18 @@ module CommonShortcuts
         end
       end
     end
+
+    def with_openssl_debug
+      around do |example|
+        v = OpenSSL.debug
+        OpenSSL.debug = true
+        begin
+          example.run
+        ensure
+          OpenSSL.debug = v
+        end
+      end
+    end
   end
 
   module InstanceMethods
@@ -195,10 +210,10 @@ module CommonShortcuts
       end
 
       if mode == :unknown
-        ismaster = {}
+        config = {}
       else
-        ismaster = {
-          'ismaster' => mode == :primary,
+        config = {
+          'isWritablePrimary' => mode == :primary,
           'secondary' => mode == :secondary,
           'arbiterOnly' => mode == :arbiter,
           'isreplicaset' => mode == :ghost,
@@ -209,7 +224,7 @@ module CommonShortcuts
           'minWireVersion' => 2, 'maxWireVersion' => 8,
         }
         if [:primary, :secondary, :arbiter, :other].include?(mode)
-          ismaster['setName'] = 'mongodb_set'
+          config['setName'] = 'mongodb_set'
         end
       end
 
@@ -226,11 +241,15 @@ module CommonShortcuts
       allow(cluster).to receive(:push_monitor_app_metadata)
       allow(cluster).to receive(:heartbeat_interval).and_return(10)
       server = Mongo::Server.new(address, cluster, monitoring, listeners,
-        SpecConfig.instance.test_options.merge(monitoring_io: false))
+        monitoring_io: false)
       # Since the server references a double for the cluster, the server
       # must be closed in the scope of the example.
       register_server(server)
-      description = Mongo::Server::Description.new(address, ismaster, average_round_trip_time)
+      description = Mongo::Server::Description.new(
+        address,
+        config,
+        average_round_trip_time,
+      )
       server.tap do |s|
         allow(s).to receive(:description).and_return(description)
       end

data/spec/support/constraints.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Constraints
 
   # Some tests hardcode the TLS certificates shipped with the driver's

data/spec/support/crypt.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # Copyright (C) 2009-2020 MongoDB Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/spec/support/dns.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'rubydns'
 
 # Hack to stop the server - https://github.com/socketry/rubydns/issues/75

data/spec/support/event_subscriber.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # Test event subscriber.
 #
 # @since 2.5.0
@@ -66,6 +69,12 @@ published=#{published_events.length}>`
     end
   end
 
+  def select_completed_events(*classes)
+    (succeeded_events + failed_events).select do |event|
+      classes.any? { |c| c === event }
+    end
+  end
+
   def select_published_events(cls)
     published_events.select do |event|
       event.is_a?(cls)

data/spec/support/json_ext_formatter.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 class JsonExtFormatter < RSpec::Core::Formatters::JsonFormatter
   RSpec::Core::Formatters.register self, :message,
     :dump_summary, :dump_profile, :stop, :seed, :close

data/spec/support/keyword_struct.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 # Intermediate step between a Struct and an OpenStruct. Allows only designated
 # field names to be read or written but allows passing fields to constructor
 # as keyword arguments.

data/spec/support/local_resource_registry.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'singleton'
 
 class LocalResourceRegistry

data/spec/support/matchers.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 RSpec::Matchers.define :be_int32 do |num|
   match do |actual|
     actual == [num].pack('l<')
@@ -20,7 +23,7 @@ end
 
 RSpec::Matchers.define :be_cstring do |string|
   match do |actual|
-    actual == "#{string.force_encoding(BSON::BINARY)}\0"
+    actual == "#{string.dup.force_encoding(BSON::BINARY)}\0"
   end
 end
 

data/spec/support/monitoring_ext.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module Mongo
   class Monitoring
     # #subscribers writes to the subscribers even when reading them,

data/spec/support/primary_socket.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 module PrimarySocket
   def self.included(base)
     base.class_eval do

data/spec/support/sdam_formatter_integration.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 $sdam_formatter_lock = Mutex.new
 
 module SdamFormatterIntegration

data/spec/support/session_registry.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'singleton'
 
 module Mongo

data/spec/{mongo/server/app_metadata_shared.rb → support/shared/app_metadata.rb}

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 shared_examples 'app metadata document' do
   let(:app_metadata) do
     described_class.new({})
@@ -8,14 +11,42 @@ shared_examples 'app metadata document' do
     document[:client][:driver][:version].should == Mongo::VERSION
   end
 
-  it 'includes operating system information' do
-    document[:client][:os][:type].should == 'linux'
-    if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
-      document[:client][:os][:name].should == 'linux'
-    else
-      document[:client][:os][:name].should == 'linux-gnu'
+  context 'linux' do
+    before(:all) do
+      unless SpecConfig.instance.linux?
+        skip "Linux required, we have #{RbConfig::CONFIG['host_os']}"
+      end
+    end
+
+    it 'includes operating system information' do
+      document[:client][:os][:type].should == 'linux'
+      if BSON::Environment.jruby? || RUBY_VERSION >= '3.0'
+        document[:client][:os][:name].should == 'linux'
+      else
+        # Ruby 2.7.2 and earlier use linux-gnu.
+        # Ruby 2.7.3 uses linux.
+        %w(linux linux-gnu).should include(document[:client][:os][:name])
+      end
+      document[:client][:os][:architecture].should == 'x86_64'
+    end
+  end
+
+  context 'macos' do
+    before(:all) do
+      unless SpecConfig.instance.macos?
+        skip "MacOS required, we have #{RbConfig::CONFIG['host_os']}"
+      end
+    end
+
+    it 'includes operating system information' do
+      document[:client][:os][:type].should == 'darwin'
+      if BSON::Environment.jruby?
+        document[:client][:os][:name].should == 'darwin'
+      else
+        document[:client][:os][:name].should =~ /darwin\d+/
+      end
+      document[:client][:os][:architecture].should == 'x86_64'
     end
-    document[:client][:os][:architecture].should == 'x86_64'
   end
 
   context 'mri' do

data/spec/support/shared/protocol.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 shared_examples 'message with a header' do
   let(:collection_name) { 'test' }
 

data/spec/support/shared/scram_conversation.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 shared_context 'scram conversation context' do
   let(:connection) do
     double('connection').tap do |connection|

data/spec/support/shared/server_selector.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 shared_context 'server selector' do
 
   let(:max_staleness) { nil }
@@ -58,10 +61,10 @@ shared_examples 'a server selector mode' do
     end
   end
 
-  describe '#slave_ok?' do
+  describe '#secondary_ok?' do
 
-    it 'returns whether the slave_ok bit should be set' do
-      expect(selector.slave_ok?).to eq(slave_ok)
+    it 'returns whether the secondary_ok bit should be set' do
+      expect(selector.secondary_ok?).to eq(secondary_ok)
     end
   end
 

data/spec/support/shared/session.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 shared_examples 'an operation using a session' do
 
   describe 'operation execution' do

data/spec/support/spec_config.rb

@@ -1,3 +1,6 @@
+# frozen_string_literal: true
+# encoding: utf-8
+
 require 'singleton'
 require 'pathname'
 
@@ -121,6 +124,14 @@ class SpecConfig
     !!(RUBY_PLATFORM =~ /\bjava\b/)
   end
 
+  def linux?
+    !!(RbConfig::CONFIG['host_os'].downcase =~ /\blinux/)
+  end
+
+  def macos?
+    !!(RbConfig::CONFIG['host_os'].downcase =~ /\bdarwin/)
+  end
+
   def platform
     RUBY_PLATFORM
   end
@@ -151,6 +162,16 @@ class SpecConfig
     ENV.key?('OCSP_CONNECTIVITY') && ENV['OCSP_CONNECTIVITY'] != ''
   end
 
+  # Detect whether specs are running against Mongodb Atlas serverless instance.
+  # This method does not do any magic, it just checks whether environment
+  # variable SERVERLESS is set. This is a recommended way to inform spec runners
+  # that they are running against a serverless instance
+  #
+  # @return [ true | false ] Whether specs are running against a serverless instance.
+  def serverless?
+    !!ENV['SERVERLESS']
+  end
+
   # Test suite configuration
 
   def client_debug?
@@ -405,17 +426,24 @@ EOT
   end
 
   def ssl_options
-    if ssl?
-      {
+    return {} unless ssl?
+    {
         ssl: true,
         ssl_verify: true,
-        ssl_cert:  client_cert_path,
-        ssl_key:  client_key_path,
-        ssl_ca_cert: ca_cert_path,
-      }.merge(Utils.underscore_hash(@uri_tls_options))
-    else
-      {}
-    end
+    }.tap do |options|
+      # We should use bundled cetificates for ssl except for testing against
+      # Atlas instances. Atlas instances have addresses in domains
+      # mongodb.net or mongodb-dev.net.
+      if @mongodb_uri.servers.grep(/mongodb.*\.net/).empty?
+        options.merge!(
+          {
+            ssl_cert: client_cert_path,
+            ssl_key: client_key_path,
+            ssl_ca_cert: ca_cert_path,
+          }
+        )
+      end
+    end.merge(Utils.underscore_hash(@uri_tls_options))
   end
 
   def compressor_options
@@ -521,6 +549,10 @@ EOT
 
   # Get the default test user for the suite on versions 2.6 and higher.
   def test_user
+    # When testing against a serverless instance, we are not allowed to create
+    # new users, we just have one user for everyhing.
+    return root_user if serverless?
+
     Mongo::Auth::User.new(
       database: 'admin',
       user: 'ruby-test-user',
@@ -566,6 +598,8 @@ EOT
         { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'change-stream-tests-2' },
         { role: Mongo::Auth::Roles::READ_WRITE, db: 'retryable-writes-tests' },
         { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'retryable-writes-tests' },
+        { role: Mongo::Auth::Roles::READ_WRITE, db: 'ts-tests' },
+        { role: Mongo::Auth::Roles::DATABASE_ADMIN, db: 'ts-tests' },
       ]
     )
   end