mongoid 7.0.12 → 7.0.13

data/spec/shared/shlib/server.sh

@@ -57,13 +57,22 @@ prepare_server_from_url() {
 
 install_mlaunch_virtualenv() {
   python2 -V || true
-  # Current virtualenv fails with
-  # https://github.com/pypa/virtualenv/issues/1630
-  python -m pip install 'virtualenv<20' --user
-  venvpath="$MONGO_ORCHESTRATION_HOME"/venv
-  python2 -m virtualenv -p python2 $venvpath
-  . $venvpath/bin/activate
-  pip install 'mtools-legacy[mlaunch]'
+  if ! python2 -m virtualenv -h >/dev/null; then
+    # Current virtualenv fails with
+    # https://github.com/pypa/virtualenv/issues/1630
+    python2 -m pip install 'virtualenv<20' --user
+  fi
+  if test "$USE_SYSTEM_PYTHON_PACKAGES" = 1 &&
+    python2 -m pip list |grep mtools-legacy
+  then
+    # Use the existing mtools-legacy
+    :
+  else
+    venvpath="$MONGO_ORCHESTRATION_HOME"/venv
+    python2 -m virtualenv -p python2 $venvpath
+    . $venvpath/bin/activate
+    pip install 'mtools-legacy[mlaunch]'
+  fi
 }
 
 install_mlaunch_pip() {
@@ -126,11 +135,22 @@ install_mlaunch_git() {
 
 calculate_server_args() {
   local mongo_version=`echo $MONGODB_VERSION |tr -d .`
+  
+  if test -z "$mongo_version"; then
+    echo "$MONGODB_VERSION must be set and not contain only dots" 1>&2
+    exit 3
+  fi
+  
   if test $mongo_version = latest; then
-    mongo_version=44
+    mongo_version=49
   fi
 
   local args="--setParameter enableTestCommands=1"
+  
+  if test $mongo_version -ge 47; then
+    args="$args --setParameter acceptAPIVersion2=1"
+  fi
+  
   # diagnosticDataCollectionEnabled is a mongod-only parameter on server 3.2,
   # and mlaunch does not support specifying mongod-only parameters:
   # https://github.com/rueckstiess/mtools/issues/696
@@ -143,7 +163,7 @@ calculate_server_args() {
     args="$args --replicaset --name ruby-driver-rs --nodes 2 --arbiter"
     export HAVE_ARBITER=1
   elif test "$TOPOLOGY" = sharded-cluster; then
-    args="$args --replicaset --nodes 1 --sharded 1 --name ruby-driver-rs"
+    args="$args --replicaset --nodes 2 --sharded 1 --name ruby-driver-rs"
     if test -z "$SINGLE_MONGOS"; then
       args="$args --mongos 2"
     fi

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ require 'support/expectations'
 require 'support/macros'
 require 'support/cluster_config'
 require 'support/constraints'
+require 'mrss/constraints'
 
 # Give MongoDB time to start up on the travis ci environment.
 if (ENV['CI'] == 'travis' || ENV['CI'] == 'evergreen')
@@ -112,6 +113,7 @@ I18n.config.enforce_available_locales = false
 RSpec.configure do |config|
   config.raise_errors_for_deprecations!
   config.include(Mongoid::Expectations)
+  config.extend(Mrss::Constraints)
   config.extend(Constraints)
   config.extend(Mongoid::Macros)
 

data/spec/support/constraints.rb

@@ -43,230 +43,4 @@ module Constraints
       end
     end
   end
-
-  def min_server_version(version)
-    unless version =~ /\A\d+\.\d+\z/
-      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 =~ /\A\d+\.\d+\z/
-      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 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
-    before(:all) do
-      case ClusterConfig.instance.topology
-      when :single
-        skip 'Transactions tests require a replica set (4.0+) or a sharded cluster (4.2+)'
-      when :replica_set
-        unless ClusterConfig.instance.server_version >= '4.0'
-          skip 'Transactions tests in a replica set topology require server 4.0+'
-        end
-      when :sharded
-        unless ClusterConfig.instance.server_version >= '4.2'
-          skip 'Transactions tests in a sharded cluster topology require server 4.2+'
-        end
-      else
-        raise NotImplementedError
-      end
-    end
-  end
-
-  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
-
-  def require_local_tls
-    require_tls
-  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
-    before(:all) do
-      unless ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-        skip "Auth required"
-      end
-    end
-  end
-
-  def require_no_auth
-    before(:all) do
-      if ENV['AUTH'] == 'auth' || SpecConfig.instance.user || ClusterConfig.instance.auth_enabled?
-        skip "Auth not allowed"
-      end
-    end
-  end
-
-  def require_no_x509_auth
-    before(:all) do
-      if SpecConfig.instance.x509_auth?
-        skip "X.509 auth not allowed"
-      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
 end

data/spec/support/spec_config.rb

@@ -44,4 +44,12 @@ class SpecConfig
   def ci?
     !!ENV['CI']
   end
+
+  def rails_version
+    v = ENV['RAILS']
+    if v == ''
+      v = nil
+    end
+    v || '6.1'
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid
 version: !ruby/object:Gem::Version
-  version: 7.0.12
+  version: 7.0.13
 platform: ruby
 authors:
 - Durran Jordan
@@ -29,7 +29,7 @@ cert_chain:
   YoFhlyUEi7VLlqNH0H/JFttVZK6+qmLelkVNcIYVLeWOB4Lf4VxEiYGEK1ORxsrY
   iyYKJJALWY1FAInGRIlvkN+B8o3yIhq1
   -----END CERTIFICATE-----
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -894,6 +894,7 @@ files:
 - spec/rails/controller_extension/controller_runtime_spec.rb
 - spec/rails/mongoid_spec.rb
 - spec/shared/LICENSE
+- spec/shared/bin/get-mongodb-download-url
 - spec/shared/lib/mrss/child_process_helper.rb
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/constraints.rb
@@ -901,13 +902,13 @@ files:
 - spec/shared/lib/mrss/lite_constraints.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/spec_organizer.rb
+- spec/shared/lib/mrss/utils.rb
 - spec/shared/share/Dockerfile.erb
 - spec/shared/shlib/distro.sh
 - spec/shared/shlib/server.sh
 - spec/shared/shlib/set_env.sh
 - spec/spec_helper.rb
 - spec/support/authorization.rb
-- spec/support/child_process_helper.rb
 - spec/support/cluster_config.rb
 - spec/support/constraints.rb
 - spec/support/expectations.rb
@@ -1222,11 +1223,13 @@ test_files:
 - spec/shared/lib/mrss/constraints.rb
 - spec/shared/lib/mrss/server_version_registry.rb
 - spec/shared/lib/mrss/docker_runner.rb
+- spec/shared/lib/mrss/utils.rb
 - spec/shared/lib/mrss/cluster_config.rb
 - spec/shared/lib/mrss/lite_constraints.rb
 - spec/shared/lib/mrss/child_process_helper.rb
 - spec/shared/lib/mrss/spec_organizer.rb
 - spec/shared/LICENSE
+- spec/shared/bin/get-mongodb-download-url
 - spec/shared/share/Dockerfile.erb
 - spec/README.md
 - spec/lite_spec_helper.rb
@@ -1237,7 +1240,6 @@ test_files:
 - spec/support/constraints.rb
 - spec/support/cluster_config.rb
 - spec/support/spec_config.rb
-- spec/support/child_process_helper.rb
 - spec/app/models/contextable_item.rb
 - spec/app/models/alert.rb
 - spec/app/models/dragon.rb

metadata.gz.sig

@@ -1,2 +1 @@
-���?��^��7f�ރH�0ﳷ����?���&h����#g����Z;kNF,Z _PA���U�s3��M��Q4�G4�|߫�_
-�Ci��6��Oa$�Q�xv���oy�:j��f�� �GI�Q�;�b�.>�&}����l-�k�( ȄT�"����Op%�2�D5��Fd�Iw#�NU�m�;�Vk&%�n����i���ak��r�����C��r
h���'��ҫ��T�^n�Q!��/�d
+0����f���f��-ٽL�y_���M��c�R$Z-�js߁�v��D�-��./�ܱ��:loI�LSU�8 ���fs��8��o�N&1�_!��΋��G}-��F�>���8�h�ZC#\���C��"ܝ�i@�EwH�:1?H�]�l���hBc�IBlL#��ڎ��|��ONvVa�o�F{<N�!Q�RP��v�:��H�x_$�[�����I��
��m�e6a���A�3�P<�ph)�9��E~�o���r{f�

data/spec/support/child_process_helper.rb

@@ -1,76 +0,0 @@
-# frozen_string_literal: true
-# encoding: utf-8
-
-autoload :ChildProcess, 'childprocess'
-autoload :Tempfile, 'tempfile'
-
-module ChildProcessHelper
-  module_function def call(cmd, env: nil, cwd: nil)
-    process = ChildProcess.new(*cmd)
-    process.io.inherit!
-    if cwd
-      process.cwd = cwd
-    end
-    if env
-      env.each do |k, v|
-        process.environment[k.to_s] = v
-      end
-    end
-    process.start
-    process.wait
-    process
-  end
-
-  module_function def check_call(cmd, env: nil, cwd: nil)
-    process = call(cmd, env: env, cwd: cwd)
-    unless process.exit_code == 0
-      raise "Failed to execute: #{cmd}"
-    end
-  end
-
-  module_function def get_output(cmd, env: nil, cwd: nil)
-    process = ChildProcess.new(*cmd)
-    process.io.inherit!
-    if cwd
-      process.cwd = cwd
-    end
-    if env
-      env.each do |k, v|
-        process.environment[k.to_s] = v
-      end
-    end
-
-    output = ''
-    r, w = IO.pipe
-
-    begin
-      process.io.stdout = w
-      process.start
-      w.close
-
-      thread = Thread.new do
-        begin
-          loop do
-            output << r.readpartial(16384)
-          end
-        rescue EOFError
-        end
-      end
-
-      process.wait
-      thread.join
-    ensure
-      r.close
-    end
-
-    [process, output]
-  end
-
-  module_function def check_output(*args)
-    process, output = get_output(*args)
-    unless process.exit_code == 0
-      raise "Failed to execute: #{args}"
-    end
-    output
-  end
-end