RubyGems - mongo - Versions diffs - 2.20.2 → 2.21.0 - Mend

@@ -176,7 +176,7 @@ module CommonShortcuts
         ClientRegistry.instance.global_client('root_authorized').command(killAllSessions: [])
       # killAllSessions also kills the implicit session which the driver uses
       # to send this command, as a result it always fails
-      rescue Mongo::Error::OperationFailure => e
+      rescue Mongo::Error::OperationFailure::Family => e
         # "operation was interrupted"
         unless e.code == 11601
           raise
@@ -337,33 +337,51 @@ module CommonShortcuts
       [:tcp, "0.0.0.0", 5300],
     ]
-    # Starts the DNS server and returns it; should be run from within an
-    # Async block. Prefer #mock_dns instead, which does the setup for you.
-    def start_dns_server(config)
-      RubyDNS::run_server(DNS_INTERFACES) do
-        config.each do |(query, type, *answers)|
-          resource_cls = Resolv::DNS::Resource::IN.const_get(type.to_s.upcase)
-          resources = answers.map do |answer|
-            resource_cls.new(*answer)
-          end
+    def mock_dns(config)
+      semaphore = Mongo::Semaphore.new
-          match(query, resource_cls) do |req|
-            req.add(resources)
+      thread = Thread.new do
+        RubyDNS::run_server(DNS_INTERFACES) do
+          config.each do |(query, type, *answers)|
+            resource_cls = Resolv::DNS::Resource::IN.const_get(type.to_s.upcase)
+            resources = answers.map do |answer|
+              resource_cls.new(*answer)
+            end
+            match(query, resource_cls) do |req|
+              req.add(resources)
+            end
           end
+          semaphore.signal
         end
       end
-    end
-    # Starts and runs a DNS server, then yields to the attached block.
-    def mock_dns(config)
-      # only require rubydns when we need it; it's MRI-only.
-      require 'rubydns'
+      semaphore.wait
-      Async do |task|
-        server = start_dns_server(config)
+      begin
         yield
       ensure
-        server.stop
+        10.times do
+          if $last_async_task
+            break
+          end
+          sleep 0.5
+        end
+        # Hack to stop the server - https://github.com/socketry/rubydns/issues/75
+        if $last_async_task.nil?
+          STDERR.puts "No async task - server never started?"
+        else
+          begin
+            $last_async_task.stop
+          rescue NoMethodError => e
+            STDERR.puts "Error stopping async task: #{e}"
+          end
+        end
+        thread.kill
+        thread.join
       end
     end
@@ -378,7 +396,7 @@ module CommonShortcuts
         client.start_session(snapshot: true) do |session|
           client[collection].aggregate([{'$match': {any: true}}], session: session).to_a
         end
-      rescue Mongo::Error::OperationFailure => e
+      rescue Mongo::Error::OperationFailure::Family => e
         # Retry them as the server demands...
         if e.code == 246 # SnapshotUnavailable
           if Mongo::Utils.monotonic_time < start_time + 10

@@ -17,16 +17,6 @@ module Constraints
     end
   end
-  def minimum_mri_version(version)
-    require_mri
-    before(:all) do
-      if RUBY_VERSION < version
-        skip "Ruby #{version} or greater is required"
-      end
-    end
-  end
   def forbid_x509_auth
     before(:all) do
       skip 'X.509 auth not allowed' if SpecConfig.instance.x509_auth?

@@ -10,7 +10,7 @@
         "path": "encryptedDate",
         "bsonType": "date",
         "queries": {
-          "queryType": "rangePreview",
+          "queryType": "range",
           "sparsity": {
             "$numberLong": "1"
           },

@@ -10,7 +10,7 @@
         "path": "encryptedDecimalNoPrecision",
         "bsonType": "decimal",
         "queries": {
-          "queryType": "rangePreview",
+          "queryType": "range",
           "sparsity": {
             "$numberInt": "1"
           }

@@ -10,7 +10,7 @@
       "path": "encryptedDecimalPrecision",
       "bsonType": "decimal",
       "queries": {
-        "queryType": "rangePreview",
+        "queryType": "range",
         "sparsity": {
           "$numberInt": "1"
         },

@@ -10,7 +10,7 @@
         "path": "encryptedDoubleNoPrecision",
         "bsonType": "double",
         "queries": {
-          "queryType": "rangePreview",
+          "queryType": "range",
           "sparsity": {
             "$numberLong": "1"
           }

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+# rubocop:todo all
+require 'rubydns'
+# Hack to stop the server - https://github.com/socketry/rubydns/issues/75
+module Async
+  class Task
+    alias :run_without_record :run
+    def run(*args)
+      run_without_record.tap do
+        $last_async_task = self
+      end
+    end
+  end
+end

@@ -110,8 +110,8 @@ shared_examples 'a failed operation using a session' do
     end
     it 'raises an error' do
-      expect([Mongo::Error::OperationFailure,
-              Mongo::Error::BulkWriteError]).to include(operation_result.class)
+      expect([Mongo::Error::OperationFailure::Family,
+              Mongo::Error::BulkWriteError].any? { |e| e === operation_result }).to be true
     end
     it 'updates the last use value' do

@@ -28,7 +28,7 @@ class SpecSetup
         # more users to any other databases.
         begin
           create_user(client, SpecConfig.instance.root_user)
-        rescue Mongo::Error::OperationFailure => e
+        rescue Mongo::Error::OperationFailure::Family => e
           # When testing a cluster that requires auth, root user is already set up
           # and it is not creatable without auth.
           # Seems like every mongodb version has its own error message
@@ -61,7 +61,7 @@ class SpecSetup
     users = client.use('admin').database.users
     begin
       users.create(user)
-    rescue Mongo::Error::OperationFailure => e
+    rescue Mongo::Error::OperationFailure::Family => e
       if e.message =~ /User.*already exists/
         users.remove(user.name)
         users.create(user)

@@ -330,8 +330,10 @@ module Utils
       when 'long'
         expected_class = BSON::Int64
         expected_key = '$numberLong'
+      when %w[int long]
+        return actual.is_a?(Numeric) || actual.is_a?(BSON::Int32) || actual.is_a?(BSON::Int64)
       else
-        raise "Tests do not currently support matching against $$type #{v['$$type']}"
+        raise "Tests do not currently support matching against $$type #{expected['$$type']}"
       end
       actual.is_a?(expected_class) || actual.key?(expected_key)

mongo 2.20.2 → 2.21.0