mongo 2.13.0.beta1 → 2.14.0

data/spec/spec_tests/uri_options_spec.rb

@@ -2,7 +2,7 @@ require 'lite_spec_helper'
 
 require 'runners/connection_string'
 
-describe 'Uri Options' do
+describe 'URI options' do
   include Mongo::ConnectionString
 
   # Since the tests issue global assertions on Mongo::Logger,
@@ -22,39 +22,23 @@ describe 'Uri Options' do
             require_mongo_kerberos
           end
 
-          context 'when the uri should warn', if: test.warn? do
+          if test.valid?
 
-            before do
-              expect(Mongo::Logger.logger).to receive(:warn)
-            end
-
-            it 'warns' do
-              expect(test.client).to be_a(Mongo::Client)
-            end
-          end
-
-          context 'when the uri is invalid', unless: test.valid? do
-
-            it 'raises an error' do
-              expect{
-                test.uri
-              }.to raise_exception(Mongo::Error::InvalidURI)
-            end
-          end
-
-          context 'when the uri should not warn', if: !test.warn? && test.valid? do
-
-            before do
-              expect(Mongo::Logger.logger).not_to receive(:warn)
+            # The warning assertion needs to be first because the test caches
+            # the client instance, and subsequent examples don't instantiate it
+            # again.
+            if test.warn?
+              it 'warns' do
+                expect(Mongo::Logger.logger).to receive(:warn)#.and_call_original
+                expect(test.client).to be_a(Mongo::Client)
+              end
+            else
+              it 'does not warn' do
+                expect(Mongo::Logger.logger).not_to receive(:warn)
+                expect(test.client).to be_a(Mongo::Client)
+              end
             end
 
-            it 'does not raise an exception or warning' do
-              expect(test.client).to be_a(Mongo::Client)
-            end
-          end
-
-          context 'when the uri is valid', if: test.valid? do
-
             if test.hosts
               it 'creates a client with the correct hosts' do
                 expect(test.client).to have_hosts(test, test.hosts)
@@ -65,8 +49,22 @@ describe 'Uri Options' do
               expect(test.client).to match_auth(test)
             end
 
-            it 'creates a client with the correct options' do
-              expect(test.client).to match_options(test)
+            if test.options
+              it 'creates a client with the correct options' do
+                mapped = Mongo::URI::OptionsMapper.new.ruby_to_smc(test.client.options)
+                expected = Mongo::ConnectionString.adjust_expected_mongo_client_options(
+                  test.options,
+                )
+                mapped.should == expected
+              end
+            end
+
+          else
+
+            it 'raises an error' do
+              expect{
+                test.uri
+              }.to raise_exception(Mongo::Error::InvalidURI)
             end
           end
         end

data/spec/stress/cleanup_spec.rb

@@ -20,17 +20,32 @@ describe 'Cleanup stress test' do
 
     it 'cleans up' do
       client
+      client.cluster.servers_list.map(&:scan!)
+
+      sleep 1
+      GC.start
 
       start_resources = resources
 
-      100.times do
+      500.times do
         client.close
         client.reconnect
       end
 
+      sleep 1
+      GC.start
+
       end_resources = resources
 
-      end_resources.should == start_resources
+      # There seem to be a temporary file descriptor leak in CI,
+      # where we start with 75 fds and end with 77 fds.
+      # Allow a few to be leaked, run more iterations to ensure the leak
+      # is not a real one.
+      # Sometimes we end with fewer fds than we started with also...
+      end_resources[:open_file_count].should >= start_resources[:open_file_count] - 3
+      end_resources[:open_file_count].should <= start_resources[:open_file_count] + 3
+
+      end_resources[:running_thread_count].should == start_resources[:running_thread_count]
     end
   end
 

data/spec/stress/connection_pool_stress_spec.rb

@@ -21,9 +21,9 @@ describe 'Connection pool stress test' do
     [].tap do |threads|
       thread_count.times do |i|
         threads << Thread.new do
-          10.times do |j|
+          100.times do |j|
             collection.find(a: i+j).to_a
-            sleep 0.5
+            sleep 0.1
             collection.find(a: i+j).to_a
           end
         end
@@ -132,7 +132,7 @@ describe 'Connection pool stress test' do
     end
 
     context '25 threads, max pool size 5' do
-      let(:thread_count) { 20 }
+      let(:thread_count) { 25 }
 
       it_behaves_like 'does not raise error'
     end
@@ -183,17 +183,19 @@ describe 'Connection pool stress test' do
       # 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 { |m, *args|
-        if rand < 0.05
+      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
 
-      expect {
+      server.pool.clear(stop_populator: false)
+
+      expect do
         threads.collect { |t| t.join }
-      }.not_to raise_error
+      end.not_to raise_error
     end
   end
 end

data/spec/stress/fork_reconnect_stress_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'fork reconnect' do
   require_fork
-  only_mri
+  require_mri
 
   # On multi-shard sharded clusters a succeeding write request does not
   # guarantee that the next operation will succeed (since it could be sent to

data/spec/support/certificates/atlas-ocsp-ca.crt

@@ -0,0 +1,28 @@
+-----BEGIN CERTIFICATE-----
+MIIElDCCA3ygAwIBAgIQAf2j627KdciIQ4tyS8+8kTANBgkqhkiG9w0BAQsFADBh
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSAwHgYDVQQDExdEaWdpQ2VydCBHbG9iYWwgUm9vdCBD
+QTAeFw0xMzAzMDgxMjAwMDBaFw0yMzAzMDgxMjAwMDBaME0xCzAJBgNVBAYTAlVT
+MRUwEwYDVQQKEwxEaWdpQ2VydCBJbmMxJzAlBgNVBAMTHkRpZ2lDZXJ0IFNIQTIg
+U2VjdXJlIFNlcnZlciBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANyuWJBNwcQwFZA1W248ghX1LFy949v/cUP6ZCWA1O4Yok3wZtAKc24RmDYXZK83
+nf36QYSvx6+M/hpzTc8zl5CilodTgyu5pnVILR1WN3vaMTIa16yrBvSqXUu3R0bd
+KpPDkC55gIDvEwRqFDu1m5K+wgdlTvza/P96rtxcflUxDOg5B6TXvi/TC2rSsd9f
+/ld0Uzs1gN2ujkSYs58O09rg1/RrKatEp0tYhG2SS4HD2nOLEpdIkARFdRrdNzGX
+kujNVA075ME/OV4uuPNcfhCOhkEAjUVmR7ChZc6gqikJTvOX6+guqw9ypzAO+sf0
+/RR3w6RbKFfCs/mC/bdFWJsCAwEAAaOCAVowggFWMBIGA1UdEwEB/wQIMAYBAf8C
+AQAwDgYDVR0PAQH/BAQDAgGGMDQGCCsGAQUFBwEBBCgwJjAkBggrBgEFBQcwAYYY
+aHR0cDovL29jc3AuZGlnaWNlcnQuY29tMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6
+Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RDQS5jcmwwN6A1
+oDOGMWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEdsb2JhbFJvb3RD
+QS5jcmwwPQYDVR0gBDYwNDAyBgRVHSAAMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8v
+d3d3LmRpZ2ljZXJ0LmNvbS9DUFMwHQYDVR0OBBYEFA+AYRyCMWHVLyjnjUY4tCzh
+xtniMB8GA1UdIwQYMBaAFAPeUDVW0Uy7ZvCj4hsbw5eyPdFVMA0GCSqGSIb3DQEB
+CwUAA4IBAQAjPt9L0jFCpbZ+QlwaRMxp0Wi0XUvgBCFsS+JtzLHgl4+mUwnNqipl
+5TlPHoOlblyYoiQm5vuh7ZPHLgLGTUq/sELfeNqzqPlt/yGFUzZgTHbO7Djc1lGA
+8MXW5dRNJ2Srm8c+cftIl7gzbckTB+6WohsYFfZcTEDts8Ls/3HB40f/1LkAtDdC
+2iDJ6m6K7hQGrn2iWZiIqBtvLfTyyRRfJs8sjX7tN8Cp1Tm5gr8ZDOo0rwAhaPit
+c+LJMto4JQtV05od8GiG7S5BNO98pVAdvzr508EIDObtHopYJeS4d60tbvVS3bR0
+j6tJLp07kzQoH3jOlOrHvdPJbRzeXDLz
+-----END CERTIFICATE-----
+

data/spec/support/certificates/atlas-ocsp.crt

@@ -0,0 +1,41 @@
+-----BEGIN CERTIFICATE-----
+MIIHOjCCBiKgAwIBAgIQBHwKuME6qrWYg7D7VTlKYjANBgkqhkiG9w0BAQsFADBN
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E
+aWdpQ2VydCBTSEEyIFNlY3VyZSBTZXJ2ZXIgQ0EwHhcNMTgwMjA3MDAwMDAwWhcN
+MjEwNTA3MDAwMDAwWjB7MQswCQYDVQQGEwJVUzERMA8GA1UECBMITmV3IFlvcmsx
+ETAPBgNVBAcTCE5ldyBZb3JrMRYwFAYDVQQKEw1Nb25nb0RCLCBJbmMuMRIwEAYD
+VQQLEwlDbG91ZCBTUkUxGjAYBgNVBAMMESoubW9uZ29kYi1kZXYubmV0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0oEdsION7ajeosGKBaZ4szN58kFz
+4EHBrgGs7N5X+4weolk4LouU0nUO2SDwjdJL5Kpbb1rUb3satTVAuNj2CDp3LynW
+Zggtf3OCbBHMKmFUMxYiriEGU/BCHo+qKlWj0eM1qRWC/9qjbg5+pvnhYEOYZgMw
+rIjD8V/j/8fO2mfBTpK+5xXeLXaIZKLgFlHWhLueTBONhSjGCHCKuI9xL6lBys3s
+QqsSMZY1weecD4jP8nVxuHpOnwdWOo2BH8d4nh8PowQYSjbrKm2n1cDGnak7oqZ4
+hpR4zjG04zOrLzw9p5uzUj4ofPhsaUC9K4sLAh01PZRnIl9tIvQkp0Xc8QIDAQAB
+o4ID5jCCA+IwHwYDVR0jBBgwFoAUD4BhHIIxYdUvKOeNRji0LOHG2eIwHQYDVR0O
+BBYEFCN2C7OPPJfzGKESo8DdeuMzXWFLMC0GA1UdEQQmMCSCESoubW9uZ29kYi1k
+ZXYubmV0gg9tb25nb2RiLWRldi5uZXQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQW
+MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBrBgNVHR8EZDBiMC+gLaArhilodHRwOi8v
+Y3JsMy5kaWdpY2VydC5jb20vc3NjYS1zaGEyLWc2LmNybDAvoC2gK4YpaHR0cDov
+L2NybDQuZGlnaWNlcnQuY29tL3NzY2Etc2hhMi1nNi5jcmwwTAYDVR0gBEUwQzA3
+BglghkgBhv1sAQEwKjAoBggrBgEFBQcCARYcaHR0cHM6Ly93d3cuZGlnaWNlcnQu
+Y29tL0NQUzAIBgZngQwBAgIwfAYIKwYBBQUHAQEEcDBuMCQGCCsGAQUFBzABhhho
+dHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRgYIKwYBBQUHMAKGOmh0dHA6Ly9jYWNl
+cnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydFNIQTJTZWN1cmVTZXJ2ZXJDQS5jcnQw
+DAYDVR0TAQH/BAIwADCCAfkGCisGAQQB1nkCBAIEggHpBIIB5QHjAHcApLkJkLQY
+WBSHuxOizGdwCjw1mAT5G9+443fNDsgN3BAAAAFhcQh6hAAABAMASDBGAiEAsBwl
+EUAJoqWKGHlG1Iw+Z9hr3RPPySoPT4PBjWRnWpcCIQC7V9EFENl7Pk6NOwRo1joZ
+OB4UNyZh1YVlQOXyZK0tUgB2AId1v+dZfPiMQ5lfvfNu/1aNR1Y2/0q1YMG06v9e
+oIMPAAABYXEIep0AAAQDAEcwRQIhALvaijTUDDPJgr79QDHN7102E3hpilLEmV02
+D5jbI3efAiB18NNDifebYBRBALyVFZf5TPwMJ4Hb//roHdTf+dqbVwB3ALvZ37wf
+inG1k5Qjl6qSe0c4V5UKq1LoGpCWZDaOHtGFAAABYXEIehQAAAQDAEgwRgIhAJao
+S5aKuudv9ZA4dUD/gEzdHZsF3M9xsa+KZHZzinT1AiEA1zAQMKp2pa8/Or5soC7M
+HrsykWEXY3lpFCsyQM+RPHUAdwBvU3asMfAxGdiZAKRRFf93FRwR2QLBACkGjbII
+mjfZEwAAAWFxCHyrAAAEAwBIMEYCIQDhtxcQCz916LqV/RKhTNOi39LW4dMPAl7Q
+eWPTaUk3dAIhAOgQiFAYkgJvun9hZk/wWZ8PaZJOGnKnkLdTM3j7ZdTNMA0GCSqG
+SIb3DQEBCwUAA4IBAQB6rK1wA1IsQCZVSXooVt79EgF3JMlgyCRZKTFD1KZtkKG7
+n9YI0Aatw3hvKpo8OV4KC1Iw1Ie6JwbVTczyHApROLSeSHTtxbfiNXmYqNVECSQt
+I+dHAYc38EKCb/XgxqfFra0vJRcCzd1yHLKJ6uERI6cJ7/vkLqJiRScHNh49Py8Y
+Osijdqd0BZnwAdFKpPtmvPNPH9JWu8RlcfWUukJKF1YgzeCjz50DL47Ykqh7C8aA
+T9B5yzkDNBg65zZSeDnX6FFo0ZC8BMxqN+kCyk3favP3NP8FBmkEZPqY0wMh3Xsd
+OdSNdcGPBlN4MiTOIkWW6JrZl6y/hQ83ktYG8wwY
+-----END CERTIFICATE-----

data/spec/support/client_registry.rb

@@ -105,6 +105,7 @@ class ClientRegistry
       }.update(SpecConfig.instance.credentials_or_external_user(
         user: SpecConfig.instance.test_user.name,
         password: SpecConfig.instance.test_user.password,
+        auth_source: 'admin',
       ))
 
       Mongo::Client.new(

data/spec/support/client_registry_macros.rb

@@ -4,8 +4,17 @@ module ClientRegistryMacros
   end
 
   def new_local_client_nmio(address, options=nil)
-    new_local_client(address, Mongo::Options::Redacted.new(
-      monitoring_io: false).merge(options || {}))
+    # Avoid type converting options.
+    base_options = {monitoring_io: false}
+    if BSON::Document === options || options&.keys&.any? { |key| String === key }
+      base_options = Mongo::Options::Redacted.new(base_options)
+    end
+    options = if options
+      base_options.merge(options)
+    else
+      base_options
+    end
+    new_local_client(address, options)
   end
 
   def close_local_clients

data/spec/support/cluster_config.rb

@@ -38,6 +38,10 @@ class ClusterConfig
   # less than 3.4. This method returns FCV on 3.4+ servers when in single
   # or RS topologies, and otherwise returns the major.minor server version.
   def fcv_ish
+    if server_version.nil?
+      raise "Deployment server version not known - check that connection to deployment succeeded"
+    end
+
     if server_version >= '3.4' && topology != :sharded
       fcv
     else

data/spec/support/common_shortcuts.rb

@@ -96,6 +96,51 @@ module CommonShortcuts
         end
       end
     end
+
+    def clear_ocsp_cache
+      before do
+        Mongo.clear_ocsp_cache
+      end
+    end
+
+    def with_ocsp_mock(ca_file_path, responder_cert_path, responder_key_path,
+      fault: nil, port: 8100
+    )
+      clear_ocsp_cache
+
+      around do |example|
+        args = [
+          SpecConfig.instance.ocsp_files_dir.join('ocsp_mock.py').to_s,
+          '--ca_file', ca_file_path.to_s,
+          '--ocsp_responder_cert', responder_cert_path.to_s,
+          '--ocsp_responder_key', responder_key_path.to_s,
+          '-p', port.to_s,
+        ]
+        if SpecConfig.instance.client_debug?
+          # Use when debugging - tests run faster without -v.
+          args << '-v'
+        end
+        if fault
+          args += ['--fault', fault]
+        end
+        process = ChildProcess.new(*args)
+
+        process.io.inherit!
+        process.start
+
+        begin
+          sleep 0.4
+          example.run
+        ensure
+          if process.exited?
+            raise "Spawned process exited before we stopped it"
+          end
+
+          process.stop
+          process.wait
+        end
+      end
+    end
   end
 
   module InstanceMethods

data/spec/support/constraints.rb

@@ -1,262 +1,15 @@
 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
-
-  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
 
+  # Some tests hardcode the TLS certificates shipped with the driver's
+  # test suite, and will fail when using TLS connections that use other
+  # certificates.
   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(*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'
+      # TODO This isn't actually the foolproof check
+      if ENV['OCSP_ALGORITHM']
+        skip 'Driver TLS certificate required, OCSP certificates are not acceptable'
       end
     end
   end