PYTHON-2697 Fix races in various CMAP spec tests (mongodb#685)

Author: ShaneHarvey

test/cmap/pool-checkout-no-idle.json

@@ -3,7 +3,8 @@
  "style": "unit",
  "description": "must destroy and must not check out an idle connection if found while iterating available connections",
  "poolOptions": {
- "maxIdleTimeMS": 10
+ "maxIdleTimeMS": 10,
+ "backgroundThreadIntervalMS": -1
  },
  "operations": [
  {
@@ -24,11 +25,6 @@
  {
  "name": "checkOut"
  },
- {
- "name": "waitForEvent",
- "event": "ConnectionClosed",
- "count": 1
- },
  {
  "name": "waitForEvent",
  "event": "ConnectionCheckedOut",
@@ -56,6 +52,11 @@
  "connectionId": 1,
  "reason": "idle",
  "address": 42
+ },
+ {
+ "type": "ConnectionCheckedOut",
+ "connectionId": 2,
+ "address": 42
  }
  ],
  "ignore": [

test/cmap/pool-checkout-no-stale.json

@@ -2,6 +2,9 @@
  "version": 1,
  "style": "unit",
  "description": "must destroy and must not check out a stale connection if found while iterating available connections",
+ "poolOptions": {
+ "backgroundThreadIntervalMS": -1
+ },
  "operations": [
  {
  "name": "ready"
@@ -23,11 +26,6 @@
  {
  "name": "checkOut"
  },
- {
- "name": "waitForEvent",
- "event": "ConnectionClosed",
- "count": 1
- },
  {
  "name": "waitForEvent",
  "event": "ConnectionCheckedOut",
@@ -59,6 +57,11 @@
  "connectionId": 1,
  "reason": "stale",
  "address": 42
+ },
+ {
+ "type": "ConnectionCheckedOut",
+ "connectionId": 2,
+ "address": 42
  }
  ],
  "ignore": [

test/cmap/pool-clear-min-size.json

@@ -3,7 +3,8 @@
  "style": "unit",
  "description": "pool clear halts background minPoolSize establishments",
  "poolOptions": {
- "minPoolSize": 1
+ "minPoolSize": 1,
+ "backgroundThreadIntervalMS": 50
  },
  "operations": [
  {

test/cmap/pool-create-min-size-error.json

@@ -23,6 +23,7 @@
  },
  "poolOptions": {
  "minPoolSize": 1,
+ "backgroundThreadIntervalMS": 50,
  "appName": "poolCreateMinSizeErrorTest"
  },
  "operations": [

test/cmap/wait-queue-timeout.json

@@ -4,7 +4,7 @@
  "description": "must aggressively timeout threads enqueued longer than waitQueueTimeoutMS",
  "poolOptions": {
  "maxPoolSize": 1,
- "waitQueueTimeoutMS": 20
+ "waitQueueTimeoutMS": 50
  },
  "operations": [
  {

test/test_cmap.py

@@ -229,7 +229,13 @@ def run_scenario(self, scenario_def, test):
  opts['event_listeners'] = [self.listener]
  opts['_monitor_class'] = DummyMonitor
  opts['connect'] = False
- with client_knobs(kill_cursor_frequency=.05,
+ # Support backgroundThreadIntervalMS, default to 50ms.
+ interval = opts.pop('backgroundThreadIntervalMS', 50)
+ if interval < 0:
+ kill_cursor_frequency = 99999999
+ else:
+ kill_cursor_frequency = interval/1000.0
+ with client_knobs(kill_cursor_frequency=kill_cursor_frequency,
  min_heartbeat_interval=.05):
  client = single_client(**opts)
  # Update the SD to a known type because the DummyMonitor will not.
@@ -242,7 +248,12 @@ def run_scenario(self, scenario_def, test):
  client_context.port)]
  client._topology._description = updated_topology_description(
  client._topology._description, sd)
- client._get_topology()
+ # When backgroundThreadIntervalMS is negative we do not start the
+ # background thread to ensure it never runs.
+ if interval < 0:
+ client._topology.open()
+ else:
+ client._get_topology()
  self.addCleanup(client.close)
  self.pool = list(client._topology._servers.values())[0].pool