Evergreen improvements

Author: papafe

evergreen/evergreen.yml

@@ -29,16 +29,16 @@ functions:
   setup-socks5-proxy:
     - command: shell.exec
       params:
+        background: true
         script: |
           ${PREPARE_SHELL}
+          MONGODB_URI="${MONGODB_URI}"
           # Read the MongoDB URI connection string and extract an arbitrary member's host:port
           HOST_PORT=$(echo "$MONGODB_URI" | sed 's|mongodb://||' | cut -d',' -f1)
 
-          # Start the SOCKS5 proxy with authentication on port 1080
-          python $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "localhost:12345 to $HOST_PORT" --port 1080 --auth username:p4ssw0rd &
-
-          # Start the SOCKS5 proxy without authentication on port 1081
-          python $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "localhost:12345 to $HOST_PORT" --port 1081 &
+          export MAP_ARG="localhost:12345 to $HOST_PORT"
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1080 --auth username:p4ssw0rd &
+          python3 $DRIVERS_TOOLS/.evergreen/socks5srv.py --map "$MAP_ARG" --port 1081
 
 #//TODO Check if we need all those parameters...
   run-socks5-proxy-tests:
@@ -1172,8 +1172,8 @@ tasks:
 #//TODO need to do the same with the other platforms
     - name: test-socks5-proxy-net60
       commands:
-        - func: setup-socks5-proxy
         - func: bootstrap-mongo-orchestration
+        - func: setup-socks5-proxy
         - func: run-socks5-proxy-tests
           vars:
             FRAMEWORK: net60

src/MongoDB.Driver/Core/Configuration/TcpStreamSettings.cs

@@ -68,27 +68,28 @@ public TcpStreamSettings(
             _socks5ProxySettings = socks5ProxySettings.WithDefault(null);
         }
 
-        // /// <summary>
-        // ///
-        // /// </summary>
-        // /// <param name="addressFamily"></param>
-        // /// <param name="connectTimeout"></param>
-        // /// <param name="readTimeout"></param>
-        // /// <param name="receiveBufferSize"></param>
-        // /// <param name="sendBufferSize"></param>
-        // /// <param name="socketConfigurator"></param>
-        // /// <param name="writeTimeout"></param>
-        // public TcpStreamSettings(
-        //     Optional<AddressFamily> addressFamily,
-        //     Optional<TimeSpan> connectTimeout,
-        //     Optional<TimeSpan?> readTimeout,
-        //     Optional<int> receiveBufferSize,
-        //     Optional<int> sendBufferSize,
-        //     Optional<Action<Socket>> socketConfigurator,
-        //     Optional<TimeSpan?> writeTimeout)
-        // {
-        //
-        // }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="TcpStreamSettings"/> class.
+        /// </summary>
+        /// <param name="addressFamily">The address family.</param>
+        /// <param name="connectTimeout">The connect timeout.</param>
+        /// <param name="readTimeout">The read timeout.</param>
+        /// <param name="receiveBufferSize">Size of the receive buffer.</param>
+        /// <param name="sendBufferSize">Size of the send buffer.</param>
+        /// <param name="socketConfigurator">The socket configurator.</param>
+        /// <param name="writeTimeout">The write timeout.</param>
+        public TcpStreamSettings(
+            Optional<AddressFamily> addressFamily,
+            Optional<TimeSpan> connectTimeout,
+            Optional<TimeSpan?> readTimeout,
+            Optional<int> receiveBufferSize,
+            Optional<int> sendBufferSize,
+            Optional<Action<Socket>> socketConfigurator,
+            Optional<TimeSpan?> writeTimeout)
+            :this(addressFamily, connectTimeout, readTimeout, receiveBufferSize, sendBufferSize, socketConfigurator, writeTimeout, null)
+        {
+
+        }
 
         internal TcpStreamSettings(TcpStreamSettings other)
         {

tests/MongoDB.Driver.TestHelpers/Core/XunitExtensions/RequireServer.cs

@@ -210,7 +210,7 @@ public RequireServer StorageEngines(params string[] storageEngines)
 
         public RequireServer Tls(bool required = true)
         {
-            var usingTls = CoreTestConfiguration.ConnectionString.Tls;
+            var usingTls = CoreTestConfiguration.ConnectionString.Tls ?? false;
             if (usingTls == required)
             {
                 return this;