Revert "Mock the clock in test_selection_failure."

Not actually a practical method of testing PYTHON-831.
This reverts commits a84eeb, 1ec4ab, and 55efc3.

Author: ajdavis

pymongo/settings.py

@@ -18,7 +18,6 @@
 
 from pymongo import monitor, pool
 from pymongo.topology_description import TOPOLOGY_TYPE
-from pymongo.monotonic import time as _time
 from pymongo.pool import PoolOptions
 from pymongo.server_description import ServerDescription
 
@@ -33,7 +32,6 @@ def __init__(
         monitor_class=None,
         condition_class=None,
         local_threshold_ms=15,
-        timer=None,
     ):
         """Represent MongoClient's configuration.
 
@@ -46,7 +44,6 @@ def __init__(
         self._monitor_class = monitor_class or monitor.Monitor
         self._condition_class = condition_class or threading.Condition
         self._local_threshold_ms = local_threshold_ms
-        self._timer = timer or _time
         self._direct = (len(self._seeds) == 1 and not replica_set_name)
 
     @property
@@ -78,11 +75,6 @@ def condition_class(self):
     def local_threshold_ms(self):
         return self._local_threshold_ms
 
-    @property
-    def timer(self):
-        """A function like time.time()."""
-        return self._timer
-
     @property
     def direct(self):
         """Connect directly to a single server, or use a set of servers?

pymongo/topology.py

@@ -25,6 +25,7 @@
                                           TOPOLOGY_TYPE,
                                           TopologyDescription)
 from pymongo.errors import AutoReconnect
+from pymongo.monotonic import time as _time
 from pymongo.server import Server
 from pymongo.server_selectors import (address_server_selector,
                                       apply_local_threshold,
@@ -80,7 +81,7 @@ def select_servers(self, selector, server_wait_time=None):
         with self._lock:
             self._description.check_compatible()
 
-            now = self._settings.timer()
+            now = _time()
             end_time = now + wait_time
             server_descriptions = self._apply_selector(selector)
 
@@ -98,7 +99,7 @@ def select_servers(self, selector, server_wait_time=None):
                 # held the lock until now.
                 self._condition.wait(common.MIN_HEARTBEAT_INTERVAL)
                 self._description.check_compatible()
-                now = self._settings.timer()
+                now = _time()
                 server_descriptions = self._apply_selector(selector)
 
             return [self.get_server_by_address(sd.address)

test/test_topology.py

@@ -36,7 +36,7 @@
 from pymongo.server_selectors import (any_server_selector,
                                       writable_server_selector)
 from pymongo.settings import TopologySettings
-from test import client_knobs, unittest
+from test import client_knobs, SkipTest, unittest
 from test.utils import wait_until
 
 
@@ -93,19 +93,16 @@ def get_topology_type(self):
 def create_mock_topology(
         seeds=None,
         replica_set_name=None,
-        monitor_class=MockMonitor,
-        condition_class=None,
-        timer=None):
+        monitor_class=MockMonitor):
     partitioned_seeds = list(imap(common.partition_node, seeds or ['a']))
     topology_settings = TopologySettings(
         partitioned_seeds,
         replica_set_name=replica_set_name,
         pool_class=MockPool,
-        monitor_class=monitor_class,
-        condition_class=condition_class,
-        timer=timer)
+        monitor_class=monitor_class)
 
     t = Topology(topology_settings)
+    t.open()
     return t
 
 
@@ -544,7 +541,6 @@ def _check_with_socket(self, sock_info):
                     raise socket.error()
 
         t = create_mock_topology(monitor_class=TestMonitor)
-        t.open()
         server = wait_for_master(t)
         self.assertEqual(1, ismaster_count[0])
         pool_id = server.pool.pool_id
@@ -566,7 +562,6 @@ def _check_with_socket(self, sock_info):
                     raise socket.error()
 
         t = create_mock_topology(monitor_class=TestMonitor)
-        t.open()
         server = wait_for_master(t)
         self.assertEqual(1, ismaster_count[0])
         self.assertEqual(SERVER_TYPE.Standalone,
@@ -578,50 +573,26 @@ def _check_with_socket(self, sock_info):
         self.assertEqual(SERVER_TYPE.Standalone, get_type(t, 'a'))
 
     def test_selection_failure(self):
-        # While ismaster fails, ensure it's called about every 10 ms.
-        timeouts = []
-
-        class TestCondition(object):
-            def __init__(self, lock=None):
-                self.condition = threading.Condition(lock)
-
-            def acquire(self):
-                return self.condition.acquire()
-
-            def release(self):
-                self.condition.release()
-
-            def wait(self, timeout=None):
-                assert timeout is not None
-                timeouts.append(timeout)
-                self.condition.wait(timeout)
+        if sys.platform == 'win32':
+            raise SkipTest('timing unreliable on Windows')
 
-            def notify(self, n=1):
-                self.condition.notify(n)
-
-            def notify_all(self):
-                self.condition.notify_all()
-
-        def timer():
-            return sum(timeouts)
+        # While ismaster fails, ensure it's called about every 10 ms.
+        ismaster_count = [0]
 
         class TestMonitor(Monitor):
             def _check_with_socket(self, sock_info):
+                ismaster_count[0] += 1
                 raise socket.error('my error')
 
-        t = create_mock_topology(monitor_class=TestMonitor,
-                                 condition_class=TestCondition,
-                                 timer=timer)
+        t = create_mock_topology(monitor_class=TestMonitor)
 
         with self.assertRaisesRegex(ConnectionFailure, 'my error'):
-            # Add slop to prevent rounding error.
-            t.select_servers(any_server_selector, server_wait_time=0.101)
-
-        self.assertEqual(
-            11,
-            len(timeouts),
-            "Expected ismaster to be attempted 101 times, not %d" %
-            len(timeouts))
+            t.select_servers(any_server_selector, server_wait_time=0.5)
+
+        self.assertTrue(
+            25 <= ismaster_count[0] <= 100,
+            "Expected ismaster to be attempted about 50 times, not %d" %
+            ismaster_count[0])
 
     def test_internal_monitor_error(self):
         exception = AssertionError('internal error')