mongo 2.14.0.rc1 → 2.15.1

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
@@ -126,7 +129,19 @@ module CommonShortcuts
         process = ChildProcess.new(*args)
 
         process.io.inherit!
-        process.start
+
+        retried = false
+        begin
+          process.start
+        rescue
+          if retried
+            raise
+          else
+            sleep 1
+            retried = true
+            retry
+          end
+        end
 
         begin
           sleep 0.4
@@ -141,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
@@ -183,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,
@@ -197,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
 
@@ -210,13 +237,19 @@ module CommonShortcuts
       allow(cluster).to receive(:app_metadata)
       allow(cluster).to receive(:options).and_return({})
       allow(cluster).to receive(:run_sdam_flow)
+      allow(cluster).to receive(:monitor_app_metadata)
+      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,105 +1,7 @@
-module Constraints
-  def min_server_version(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before(:all) do
-      if version > ClusterConfig.instance.server_version
-        skip "Server version #{version} or higher required, we have #{ClusterConfig.instance.server_version}"
-      end
-    end
-  end
-
-  def max_server_version(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before(:all) do
-      if version < ClusterConfig.instance.short_server_version
-        skip "Server version #{version} or lower required, we have #{ClusterConfig.instance.server_version}"
-      end
-    end
-  end
-
-  def min_server_fcv(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "FCV can only be major.minor: #{version}"
-    end
-
-    before(:all) do
-      unless ClusterConfig.instance.fcv_ish >= version
-        skip "FCV #{version} or higher required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
-      end
-    end
-  end
-
-  def max_server_fcv(version)
-    unless version =~ /^\d+\.\d+$/
-      raise ArgumentError, "Version can only be major.minor: #{version}"
-    end
-
-    before(:all) do
-      if version < ClusterConfig.instance.fcv_ish
-        skip "FCV #{version} or lower required, we have #{ClusterConfig.instance.fcv_ish} (server #{ClusterConfig.instance.server_version})"
-      end
-    end
-  end
-
-  def require_topology(*topologies)
-    invalid_topologies = topologies - [:single, :replica_set, :sharded]
-    unless invalid_topologies.empty?
-      raise ArgumentError, "Invalid topologies requested: #{invalid_topologies.join(', ')}"
-    end
-    before(:all) do
-      unless topologies.include?(topology = ClusterConfig.instance.topology)
-        skip "Topology #{topologies.join(' or ')} required, we have #{topology}"
-      end
-    end
-  end
-
-  def max_example_run_time(timeout)
-    around do |example|
-      TimeoutInterrupt.timeout(timeout, TimeoutInterrupt::Error.new("Test execution terminated after #{timeout} seconds")) do
-        example.run
-      end
-    end
-  end
-
-  def require_transaction_support
-    min_server_fcv '4.0'
-    require_topology :replica_set
-  end
-
-  # Fail command fail point was added to mongod in 4.0 and to mongos in 4.2.
-  def require_fail_command
-    min_server_fcv '4.0'
-
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded
-        unless ClusterConfig.instance.short_server_version >= '4.2'
-          skip 'Test requires failCommand fail point which was added to mongos in 4.2'
-        end
-      end
-    end
-  end
+# frozen_string_literal: true
+# encoding: utf-8
 
-  def require_tls
-    before(:all) do
-      unless SpecConfig.instance.ssl?
-        skip "SSL not enabled"
-      end
-    end
-  end
-
-  def require_no_tls
-    before(:all) do
-      if SpecConfig.instance.ssl?
-        skip "SSL enabled"
-      end
-    end
-  end
+module Constraints
 
   # Some tests hardcode the TLS certificates shipped with the driver's
   # test suite, and will fail when using TLS connections that use other
@@ -114,173 +16,4 @@ module Constraints
       end
     end
   end
-
-  def require_no_retry_writes
-    before(:all) do
-      if SpecConfig.instance.retry_writes?
-        skip "Retry writes is enabled"
-      end
-    end
-  end
-
-  def require_compression
-    before(:all) do
-      if SpecConfig.instance.compressors.nil?
-        skip "Compression is not enabled"
-      end
-    end
-  end
-
-  def require_no_compression
-    before(:all) do
-      if SpecConfig.instance.compressors
-        skip "Compression is enabled"
-      end
-    end
-  end
-
-  def ruby_version_gte(version)
-    before(:all) do
-      if RUBY_VERSION < version
-        skip "Ruby version #{version} or higher required"
-      end
-    end
-  end
-
-  def ruby_version_lt(version)
-    before(:all) do
-      if RUBY_VERSION >= version
-        skip "Ruby version less than #{version} required"
-      end
-    end
-  end
-
-  def require_auth(*values)
-    before(:all) do
-      if values.any?
-        unless values.include?(ENV['AUTH'])
-          msg = values.map { |v| "AUTH=#{v}" }.join(' or ')
-          skip "This test requires #{msg}"
-        end
-      else
-        unless ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-          skip "Auth required"
-        end
-      end
-    end
-  end
-
-  def require_no_auth
-    before(:all) do
-      if (ENV['AUTH'] && ENV['AUTH'] != 'noauth') || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-        skip "Auth not allowed"
-      end
-    end
-  end
-
-  def require_x509_auth
-    before(:all) do
-      unless SpecConfig.instance.x509_auth?
-        skip "X.509 auth required"
-      end
-    end
-  end
-
-  def require_no_external_user
-    before(:all) do
-      if SpecConfig.instance.external_user?
-        skip "External user configurations are not compatible with this test"
-      end
-    end
-  end
-
-  # Can the driver specify a write concern that won't be overridden?
-  # (mongos 4.0+ overrides the write concern)
-  def require_set_write_concern
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && ClusterConfig.instance.short_server_version >= '4.0'
-        skip "mongos 4.0+ overrides write concern"
-      end
-    end
-  end
-
-  def require_multi_shard
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length == 1
-        skip 'Test requires a minimum of two shards if run in sharded topology'
-      end
-    end
-  end
-
-  def require_no_multi_shard
-    before(:all) do
-      if ClusterConfig.instance.topology == :sharded && SpecConfig.instance.addresses.length > 1
-        skip 'Test requires a single shard if run in sharded topology'
-      end
-    end
-  end
-
-  def require_wired_tiger
-    before(:all) do
-      if ClusterConfig.instance.storage_engine != :wired_tiger
-        skip 'Test requires WiredTiger storage engine'
-      end
-    end
-  end
-
-  def require_wired_tiger_on_36
-    before(:all) do
-      if ClusterConfig.instance.short_server_version >= '3.6'
-        if ClusterConfig.instance.storage_engine != :wired_tiger
-          skip 'Test requires WiredTiger storage engine on 3.6+ servers'
-        end
-      end
-    end
-  end
-
-  def require_mmapv1
-    before(:all) do
-      if ClusterConfig.instance.storage_engine != :mmapv1
-        skip 'Test requires MMAPv1 storage engine'
-      end
-    end
-  end
-
-  def require_enterprise
-    before(:all) do
-      unless ClusterConfig.instance.enterprise?
-        skip 'Test requires enterprise build of MongoDB'
-      end
-    end
-  end
-
-  # Integration tests for SRV polling require internet connectivity to
-  # look up SRV records and a sharded cluster configured on default port on
-  # localhost (localhost:27017, localhost:27018).
-  def require_default_port_deployment
-    # Because the DNS records at test1.test.build.10gen.cc point to
-    # localhost:27017 & localhost:27018, the test suite must have been
-    # configured to use these addresses
-    before(:all) do
-      have_default_port = SpecConfig.instance.addresses.any? do |address|
-        %w(127.0.0.1 127.0.0.1:27017 localhost localhost:27017).include?(address)
-      end
-      unless have_default_port
-        skip 'This test requires the test suite to be configured for localhost:27017'
-      end
-    end
-  end
-
-  # Some tests perform assertions on what the driver is logging.
-  # Some test configurations, for example OCSP with unknown response,
-  # produce warnings due to optional checks failing.
-  # This constraint skips tests that issue logging assertions on configurations
-  # that may produce non-test-originated log entries.
-  def require_warning_clean
-    before(:all) do
-      if ENV['OCSP_STATUS'] == 'unknown'
-        skip 'Unknown OCSP status is not global warning-clean'
-      end
-    end
-  end
 end

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");