mongo 2.18.2 → 2.19.3

data/spec/spec_tests/data/unified/valid-pass/poc-retryable-reads.yml

@@ -93,7 +93,7 @@ tests:
               closeConnection: true
       # Find options and expected result changed to use common initialData
       - name: find
-        object: collection0
+        object: *collection0
         arguments:
           filter: {}
           sort: { _id: 1 }
@@ -127,7 +127,7 @@ tests:
               failCommands: [ find ]
               closeConnection: true
       - name: find
-        object: collection1 # client uses retryReads=false
+        object: *collection1 # client uses retryReads=false
         arguments:
           filter: {}
           # Other arguments in the original test are not relevant
@@ -154,7 +154,7 @@ tests:
               failCommands: [ find ]
               closeConnection: true
       - name: find
-        object: collection0
+        object: *collection0
         arguments:
           filter: {}
           # Other arguments in the original test are not relevant

data/spec/spec_tests/data/unified/valid-pass/poc-retryable-writes.yml

@@ -141,8 +141,8 @@ tests:
             - { _id: 4, x: 44 }
           ordered: true
         expectResult:
-          insertedCount: { $$unsetOrMatches: 2 }
-          insertedIds: { $$unsetOrMatches: { 0: 3, 1: 4 } }
+          # InsertManyResult is optional because all of its fields are optional
+          $$unsetOrMatches: { insertedIds: { $$unsetOrMatches: { 0: 3, 1: 4 } } }
     outcome:
       - collectionName: *collectionName
         databaseName: *databaseName

data/spec/spec_tests/data/versioned_api/crud-api-version-1-strict.yml

@@ -231,7 +231,7 @@ tests:
   - description: "estimatedDocumentCount appends declared API version"
     # See: https://jira.mongodb.org/browse/SERVER-63850
     runOnRequirements:
-      - minServerVersion: "5.0.8"
+      - minServerVersion: "5.0.9"
         maxServerVersion: "5.0.99"
       - minServerVersion: "5.3.2"
     operations:

data/spec/spec_tests/data/versioned_api/crud-api-version-1.yml

@@ -225,7 +225,7 @@ tests:
   - description: "estimatedDocumentCount appends declared API version"
     # See: https://jira.mongodb.org/browse/SERVER-63850
     runOnRequirements:
-      - minServerVersion: "5.0.8"
+      - minServerVersion: "5.0.9"
         maxServerVersion: "5.0.99"
       - minServerVersion: "5.3.2"
     operations:

data/spec/spec_tests/data/versioned_api/transaction-handling.yml

@@ -1,10 +1,10 @@
 description: "Transaction handling"
 
-schemaVersion: "1.1"
+schemaVersion: "1.3"
 
 runOnRequirements:
   - minServerVersion: "4.9"
-    topologies: [ replicaset, sharded-replicaset ]
+    topologies: [ replicaset, sharded, load-balanced ]
 
 createEntities:
   - client:
@@ -46,7 +46,7 @@ initialData:
 tests:
   - description: "All commands in a transaction declare an API version"
     runOnRequirements:
-      - topologies: [ replicaset, sharded-replicaset ]
+      - topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: startTransaction
         object: *session
@@ -87,7 +87,7 @@ tests:
                 <<: *expectedApiVersion
   - description: "abortTransaction includes an API version"
     runOnRequirements:
-      - topologies: [ replicaset, sharded-replicaset ]
+      - topologies: [ replicaset, sharded, load-balanced ]
     operations:
       - name: startTransaction
         object: *session

data/spec/spec_tests/gridfs_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/gridfs_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/index_management_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/index_management"
+INDEX_MANAGEMENT_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+# rubocop:disable RSpec/EmptyExampleGroup
+describe 'index management unified spec tests' do
+  define_unified_spec_tests(base, INDEX_MANAGEMENT_UNIFIED_TESTS)
+end
+# rubocop:enable RSpec/EmptyExampleGroup

data/spec/spec_tests/load_balancers_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/max_staleness_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/read_write_concern_connection_string_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/read_write_concern_document_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 require 'runners/read_write_concern_document'

data/spec/spec_tests/read_write_concern_operaton_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/retryable_reads_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -25,6 +25,8 @@ describe 'Retryable reads spec tests - legacy' do
   require_no_multi_mongos
 
   define_crud_spec_tests(RETRYABLE_READS_TESTS) do |spec, req, test|
+    retry_test
+
     let(:client_options) do
       {
         max_read_retries: 1,

data/spec/spec_tests/retryable_reads_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/retryable_writes_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/retryable_writes_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/sdam_monitoring_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/sdam_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 
@@ -47,6 +47,10 @@ describe 'Server Discovery and Monitoring' do
           heartbeat_frequency: 1000, connect_timeout: 0.1)
       end
 
+      before do
+        @client.reconnect if @client.closed?
+      end
+
       after(:all) do
         @client && @client.close
       end

data/spec/spec_tests/sdam_unified_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+# rubocop:todo all
+
+require 'spec_helper'
+
+require 'runners/unified'
+
+base = "#{CURRENT_PATH}/spec_tests/data/sdam_unified"
+SDAM_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'SDAM unified spec tests' do
+  define_unified_spec_tests(base, SDAM_UNIFIED_TESTS)
+end

data/spec/spec_tests/seed_list_discovery_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/server_selection_rtt_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/server_selection_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/sessions_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/transactions_api_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/transactions_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/transactions_unified_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/spec_tests/unified_spec.rb

@@ -1,12 +1,11 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
 require 'runners/unified'
 
 base = "#{CURRENT_PATH}/spec_tests/data/unified"
-INVALID_UNIFIED_TESTS = Dir.glob("#{base}/invalid/**/*.yml").sort
 PASS_UNIFIED_TESTS = Dir.glob("#{base}/valid-pass/**/*.yml").sort
 FAIL_UNIFIED_TESTS = Dir.glob("#{base}/valid-fail/**/*.yml").sort
 
@@ -14,10 +13,6 @@ describe 'Unified spec tests - valid pass' do
   define_unified_spec_tests(base, PASS_UNIFIED_TESTS)
 end
 
-describe 'Unified spec tests - invalid' do
-  define_unified_spec_tests(base, INVALID_UNIFIED_TESTS)
-end
-
 describe 'Unified spec tests - expected failures' do
   define_unified_spec_tests(base, FAIL_UNIFIED_TESTS, expect_failure: true)
 end

data/spec/spec_tests/uri_options_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'lite_spec_helper'
 

data/spec/spec_tests/versioned_api_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/stress/cleanup_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/stress/connection_pool_stress_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -140,65 +140,4 @@ describe 'Connection pool stress test' do
       it_behaves_like 'does not raise error'
     end
   end
-
-  context 'when primary pool is disconnected' do
-    let(:threads) do
-      threads = operation_threads
-
-      # thread that disconnects primary's pool
-      threads << Thread.new do
-        sleep 0.2
-        server = client.cluster.next_primary
-        server.pool.disconnect!
-      end
-    end
-
-    it_behaves_like 'does not raise error'
-  end
-
-  context 'when all pools are disconnected' do
-    let(:threads) do
-      threads = operation_threads
-
-      # thread that disconnects each server's pool
-      threads << Thread.new do
-        sleep 0.2
-
-        client.cluster.servers_list.each do |server|
-          if server.description.data_bearing?
-            server.pool.disconnect!
-          end
-        end
-      end
-    end
-
-    it_behaves_like 'does not raise error'
-  end
-
-  context 'when populator connection auth sometimes fails' do
-    let(:threads) { operation_threads }
-
-    it 'does not raise error' do
-      server = client.cluster.next_primary
-
-      # We only want to test connection failure on the populator; connection failures
-      # occurring in the check_out method should raise an error.
-      # The populator calls create_and_add_connection, which calls connection.connect!
-      # and raises if an error occurs (eg, an auth error), so in this test we
-      # randomly raise errors on this method.
-      expect(server.pool).to receive(:create_and_add_connection).at_least(:once).and_wrap_original do |m, *args|
-        if rand < 0.1
-          raise Mongo::Error::SocketError
-        else
-          m.call(*args)
-        end
-      end
-
-      server.pool.clear(stop_populator: false)
-
-      expect do
-        threads.collect { |t| t.join }
-      end.not_to raise_error
-    end
-  end
 end

data/spec/stress/connection_pool_timing_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -67,11 +67,11 @@ describe 'Connection pool timing test' do
     let(:threads) { operation_threads }
 
     it 'does not error' do
-      start = Time.now
+      start = Mongo::Utils.monotonic_time
       expect {
         threads.collect { |t| t.join }
       }.not_to raise_error
-      puts "[Connection Pool Timing] Duration with no max idle time: #{Time.now - start}"
+      puts "[Connection Pool Timing] Duration with no max idle time: #{Mongo::Utils.monotonic_time - start}"
     end
   end
 
@@ -83,36 +83,11 @@ describe 'Connection pool timing test' do
     let(:threads) { operation_threads }
 
     it 'does not error' do
-      start = Time.now
+      start = Mongo::Utils.monotonic_time
       expect {
         threads.collect { |t| t.join }
       }.not_to raise_error
-      puts "[Connection Pool Timing] Duration with low max idle time: #{Time.now - start}"
-    end
-  end
-
-  context 'when clear is called periodically' do
-    let(:options) do
-      { max_pool_size: 10, min_pool_size: 5 }
-    end
-
-    let(:threads) do
-      threads = operation_threads
-      threads << Thread.new do
-        10.times do
-          sleep 0.1
-          client.cluster.next_primary.pool.clear
-        end
-      end
-      threads
-    end
-
-    it 'does not error' do
-      start = Time.now
-      expect {
-        threads.collect { |t| t.join }
-      }.not_to raise_error
-      puts "[Connection Pool Timing] Duration when clear is called periodically: #{Time.now - start}"
+      puts "[Connection Pool Timing] Duration with low max idle time: #{Mongo::Utils.monotonic_time - start}"
     end
   end
 
@@ -156,9 +131,9 @@ describe 'Connection pool timing test' do
         # when trying to perform operations during primary change
         sleep 1
 
-        @primary_change_start = Time.now
+        @primary_change_start = Mongo::Utils.monotonic_time
         ClusterTools.instance.change_primary
-        @primary_change_end = Time.now
+        @primary_change_end = Mongo::Utils.monotonic_time
 
         # Primary change is complete; execute more operations
         more_threads.collect { |t| t.join }
@@ -172,14 +147,14 @@ describe 'Connection pool timing test' do
     retry_test tries: (BSON::Environment.jruby? ? 3 : 1)
     it 'does not error' do
       threads
-      start = Time.now
+      start = Mongo::Utils.monotonic_time
       expect do
         threads.each do |t|
           t.join
         end
       end.not_to raise_error
       puts "[Connection Pool Timing] Duration before primary change: #{@primary_change_start - start}. "\
-        "Duration after primary change: #{Time.now - @primary_change_end}"
+        "Duration after primary change: #{Mongo::Utils.monotonic_time - @primary_change_end}"
     end
   end
 end

data/spec/stress/fork_reconnect_stress_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 
@@ -27,20 +27,20 @@ describe 'fork reconnect' do
       client['foo'].insert_one(test: 1)
 
       pids = []
-      deadline = Time.now + 5
+      deadline = Mongo::Utils.monotonic_time + 5
       1.upto(10) do
         if pid = fork
           pids << pid
         else
           Utils.wrap_forked_child do
-            while Time.now < deadline
+            while Mongo::Utils.monotonic_time < deadline
               client.database.command(hello: 1).should be_a(Mongo::Operation::Result)
             end
           end
         end
       end
 
-      while Time.now < deadline
+      while Mongo::Utils.monotonic_time < deadline
         # Use a read which is retried in case of an error
         client['foo'].find(test: 1).to_a
       end
@@ -78,20 +78,20 @@ describe 'fork reconnect' do
         end
 
         pids = []
-        deadline = Time.now + 5
+        deadline = Mongo::Utils.monotonic_time + 5
         10.times do
           if pid = fork
             pids << pid
           else
             Utils.wrap_forked_child do
-              while Time.now < deadline
+              while Mongo::Utils.monotonic_time < deadline
                 client.database.command(hello: 1).should be_a(Mongo::Operation::Result)
               end
             end
           end
         end
 
-        while Time.now < deadline
+        while Mongo::Utils.monotonic_time < deadline
           sleep 0.1
         end
 
@@ -103,7 +103,6 @@ describe 'fork reconnect' do
           status.exitstatus.should == 0
         end
       end
-
     end
   end
 end

data/spec/stress/push_monitor_close_spec.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 require 'spec_helper'
 

data/spec/support/authorization.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 # Copyright (C) 2009-2020 MongoDB Inc.
 #

data/spec/support/aws_utils/base.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module AwsUtils
   class Base

data/spec/support/aws_utils/inspector.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
-# encoding: utf-8
+# rubocop:todo all
 
 module AwsUtils
   class Inspector < Base