mongo 2.19.3 → 2.20.0

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

@@ -2,10 +2,6 @@ description: "poc-retryable-writes"
 
 schemaVersion: "1.0"
 
-runOnRequirements:
-  - minServerVersion: "3.6"
-    topologies: [ replicaset ]
-
 createEntities:
   - client:
       id: &client0 client0
@@ -42,6 +38,9 @@ initialData:
 
 tests:
   - description: "FindOneAndUpdate is committed on first attempt"
+    runOnRequirements: &onPrimaryTransactionalWrite_requirements
+      - minServerVersion: "3.6"
+        topologies: [ replicaset ]
     operations:
       - name: failPoint
         object: testRunner
@@ -65,6 +64,7 @@ tests:
           - { _id: 2, x: 22 }
 
   - description: "FindOneAndUpdate is not committed on first attempt"
+    runOnRequirements: *onPrimaryTransactionalWrite_requirements
     operations:
       - name: failPoint
         object: testRunner
@@ -89,6 +89,7 @@ tests:
           - { _id: 2, x: 22 }
 
   - description: "FindOneAndUpdate is never committed"
+    runOnRequirements: *onPrimaryTransactionalWrite_requirements
     operations:
       - name: failPoint
         object: testRunner
@@ -117,9 +118,7 @@ tests:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.7"
-        # Original test uses "sharded", but retryable writes requires a sharded
-        # cluster backed by replica sets
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner
@@ -192,6 +191,7 @@ tests:
             mode: { times: 2 }
             data:
               failCommands: [ insert ]
+              errorLabels: [ RetryableWriteError ]
               writeConcernError:
                 code: 91 # ShutdownInProgress
                 errmsg: "Replication is being shut down"

data/spec/spec_tests/data/unified/valid-pass/poc-sessions.yml

@@ -125,12 +125,11 @@ tests:
   - description: "Dirty explicit session is discarded"
     skipReason: RUBY-1813
     # Original test specified retryWrites=true, but that is now the default.
-    # Retryable writes will require a sharded-replicaset, though.
     runOnRequirements:
       - minServerVersion: "4.0"
         topologies: [ replicaset ]
       - minServerVersion: "4.1.8"
-        topologies: [ sharded-replicaset ]
+        topologies: [ sharded ]
     operations:
       - name: failPoint
         object: testRunner
@@ -181,7 +180,7 @@ tests:
           - commandStartedEvent: &insert_attempt
               command:
                 insert: *collection0Name
-                documents: 
+                documents:
                   - { _id: 2 }
                 ordered: true
                 lsid: { $$sessionLsid: *session0 }
@@ -192,7 +191,7 @@ tests:
           - commandStartedEvent:
               command:
                 insert: *collection0Name
-                documents: 
+                documents:
                   - { _id: 3 }
                 ordered: true
                 lsid: { $$sessionLsid: *session0 }

data/spec/spec_tests/data/unified/valid-pass/poc-transactions-convenient-api.yml

@@ -6,7 +6,7 @@ runOnRequirements:
   - minServerVersion: "4.0"
     topologies: [ replicaset ]
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:

data/spec/spec_tests/data/unified/valid-pass/poc-transactions-mongos-pin-auto.yml

@@ -4,7 +4,7 @@ schemaVersion: "1.0"
 
 runOnRequirements:
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:

data/spec/spec_tests/data/unified/valid-pass/poc-transactions.yml

@@ -6,7 +6,7 @@ runOnRequirements:
   - minServerVersion: "4.0"
     topologies: [ replicaset ]
   - minServerVersion: "4.1.8"
-    topologies: [ sharded-replicaset ]
+    topologies: [ sharded ]
 
 createEntities:
   - client:
@@ -51,7 +51,7 @@ tests:
   - description: "explicitly create collection using create command"
     runOnRequirements:
       - minServerVersion: "4.3.4"
-        topologies: [ replicaset, sharded-replicaset ]
+        topologies: [ replicaset, sharded ]
     operations:
       - name: dropCollection
         object: *database0
@@ -109,7 +109,7 @@ tests:
   - description: "create index on a non-existing collection"
     runOnRequirements:
       - minServerVersion: "4.3.4"
-        topologies: [ replicaset, sharded-replicaset ]
+        topologies: [ replicaset, sharded ]
     operations:
       - name: dropCollection
         object: *database0

data/spec/spec_tests/run_command_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/run_command_unified"
+RUN_COMMAND_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
+
+describe 'runCommand unified spec tests' do
+  define_unified_spec_tests(base, RUN_COMMAND_UNIFIED_TESTS)
+end

data/spec/spec_tests/sdam_unified_spec.rb

@@ -9,5 +9,7 @@ base = "#{CURRENT_PATH}/spec_tests/data/sdam_unified"
 SDAM_UNIFIED_TESTS = Dir.glob("#{base}/**/*.yml").sort
 
 describe 'SDAM unified spec tests' do
+  forbid_x509_auth
+
   define_unified_spec_tests(base, SDAM_UNIFIED_TESTS)
 end

data/spec/support/constraints.rb

@@ -17,6 +17,12 @@ module Constraints
     end
   end
 
+  def forbid_x509_auth
+    before(:all) do
+      skip 'X.509 auth not allowed' if SpecConfig.instance.x509_auth?
+    end
+  end
+
   def max_bson_version(version)
     required_version = version.split('.').map(&:to_i)
     actual_version = bson_version(required_version.length)

data/spec/support/ocsp

@@ -1 +1 @@
-spec/support/../../.mod/drivers-evergreen-tools/.evergreen/ocsp
+../../.mod/drivers-evergreen-tools/.evergreen/ocsp

data/spec/support/recording_logger.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+# rubocop:todo all
+
+require 'stringio'
+
+# A "Logger-alike" class, quacking like ::Logger, used for recording messages
+# as they are written to the log
+class RecordingLogger < Logger
+  def initialize(*args, **kwargs)
+    @buffer = StringIO.new
+    super(@buffer, *args, **kwargs)
+  end
+
+  # Accesses the raw contents of the log
+  #
+  # @return [ String ] the raw contents of the log
+  def contents
+    @buffer.string
+  end
+
+  # Returns the contents of the log as individual lines.
+  #
+  # @return [ Array<String> ] the individual log lines
+  def lines
+    contents.split(/\n/)
+  end
+end