CDRIVER-2057: localThresholdMS should default to 15 milliseconds

# Conflicts:
#	tests/json-test.c

Author: jmikola

src/mongoc/mongoc-topology-private.h

@@ -27,7 +27,7 @@
 #define MONGOC_TOPOLOGY_MIN_HEARTBEAT_FREQUENCY_MS 500
 #define MONGOC_TOPOLOGY_SOCKET_CHECK_INTERVAL_MS 5000
 #define MONGOC_TOPOLOGY_COOLDOWN_MS 5000
-#define MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS 15000
+#define MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS 15
 #define MONGOC_TOPOLOGY_SERVER_SELECTION_TIMEOUT_MS 30000
 #define MONGOC_TOPOLOGY_HEARTBEAT_FREQUENCY_MS_MULTI_THREADED 10000
 #define MONGOC_TOPOLOGY_HEARTBEAT_FREQUENCY_MS_SINGLE_THREADED 60000

tests/json-test.c

@@ -451,11 +451,8 @@ test_server_selection_logic_cb (bson_t *test)
    assert (bson_iter_init_find (&iter, test, "in_latency_window"));
 
    /* TODO: use topology_select instead? */
-   mongoc_topology_description_suitable_servers (&selected_servers,
-                                                 op,
-                                                 &topology,
-                                                 read_prefs,
-                                                 15);
+   mongoc_topology_description_suitable_servers (
+      &selected_servers, op, &topology, read_prefs, MONGOC_TOPOLOGY_LOCAL_THRESHOLD_MS);
 
    /* check each server in expected_servers is in selected_servers */
    memset (matched_servers, 0, sizeof (matched_servers));