SWIFT-703 Re-enable Atlas tests (#396)

Author: kmahar

.evergreen/config.yml

@@ -144,7 +144,9 @@ functions:
         working_dir: "src"
         script: |
           # DO NOT ECHO WITH XTRACE (which PREPARE_SHELL does)
-          SWIFT_VERSION=${SWIFT_VERSION} ATLAS_REPL='${ATLAS_REPL}' ATLAS_SHRD='${ATLAS_SHRD}' ATLAS_FREE='${ATLAS_FREE}' ATLAS_TLS11='${ATLAS_TLS11}' ATLAS_TLS12='${ATLAS_TLS12}'  sh ${PROJECT_DIRECTORY}/.evergreen/run-atlas-tests.sh
+          SWIFT_VERSION=${SWIFT_VERSION} ATLAS_REPL='${ATLAS_REPL}' ATLAS_SHRD='${ATLAS_SHRD}' ATLAS_FREE='${ATLAS_FREE}' ATLAS_TLS11='${ATLAS_TLS11}' ATLAS_TLS12='${ATLAS_TLS12}' \
+          ATLAS_REPL_SRV='${ATLAS_REPL_SRV}' ATLAS_SHRD_SRV='${ATLAS_SHRD_SRV}' ATLAS_FREE_SRV='${ATLAS_FREE_SRV}' ATLAS_TLS11_SRV='${ATLAS_TLS11_SRV}' ATLAS_TLS12_SRV='${ATLAS_TLS12_SRV}' \
+          sh ${PROJECT_DIRECTORY}/.evergreen/run-atlas-tests.sh
 
   "cleanup":
     - command: shell.exec
@@ -425,11 +427,10 @@ buildvariants:
     then:
       remove_tasks: ".3.6"
 
-# TODO SWIFT-703: reenable
-# - matrix_name: "atlas-connect"
-#   matrix_spec:
-#     os-fully-featured: ubuntu-18.04
-#     swift-version: "*"
-#   display_name: "Atlas Connectivity ${swift-version} ${os-fully-featured}"
-#   tasks:
-#     - ".atlas-connect"
+- matrix_name: "atlas-connect"
+  matrix_spec:
+    os-fully-featured: "*"
+    swift-version: "*"
+  display_name: "Atlas Connectivity ${swift-version} ${os-fully-featured}"
+  tasks:
+    - ".atlas-connect"

.evergreen/run-atlas-tests.sh

@@ -16,4 +16,6 @@ eval "$(swiftenv init -)"
 swiftenv local $SWIFT_VERSION
 
 # run the tests
-ATLAS_REPL="$ATLAS_REPL" ATLAS_SHRD="$ATLAS_SHRD" ATLAS_FREE="$ATLAS_FREE" ATLAS_TLS11="$ATLAS_TLS11" ATLAS_TLS12="$ATLAS_TLS12" swift run AtlasConnectivity $EXTRA_FLAGS
+ATLAS_REPL="$ATLAS_REPL" ATLAS_SHRD="$ATLAS_SHRD" ATLAS_FREE="$ATLAS_FREE" ATLAS_TLS11="$ATLAS_TLS11" ATLAS_TLS12="$ATLAS_TLS12" \
+ATLAS_REPL_SRV="$ATLAS_REPL_SRV" ATLAS_SHRD_SRV="$ATLAS_SHRD_SRV" ATLAS_FREE_SRV="$ATLAS_FREE_SRV" ATLAS_TLS11_SRV="$ATLAS_TLS11_SRV" ATLAS_TLS12_SRV="$ATLAS_TLS12_SRV" \
+swift run AtlasConnectivity $EXTRA_FLAGS

Sources/AtlasConnectivity/main.swift

@@ -2,12 +2,13 @@ import Foundation
 import MongoSwiftSync
 
 private let configs = ["ATLAS_REPL", "ATLAS_SHRD", "ATLAS_FREE", "ATLAS_TLS11", "ATLAS_TLS12"]
+private let srvConfigs = configs.map { $0 + "_SRV" }
 
-for config in configs {
+for config in configs + srvConfigs {
     print("Testing config \(config)... ", terminator: "")
 
     guard let uri = ProcessInfo.processInfo.environment[config] else {
-        print("Failed: couldn't find URI")
+        print("Failed: couldn't find URI for config \(config)")
         exit(1)
     }
 
@@ -18,8 +19,7 @@ for config in configs {
         _ = try db.runCommand(["isMaster": 1])
         // findOne
         let coll = db.collection("test")
-        let res = try coll.find(options: FindOptions(limit: 1))
-        for _ in res {} // iterate cursor so we actually talk to server
+        _ = try coll.findOne()
     } catch {
         print("Failed: \(error)")
         exit(1)