Fix test: allow ignoring non-existant file when cleaning up

.travis.yml

@@ -36,22 +36,24 @@ matrix:
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.0.3-xenial SWIFT_SNAPSHOT=5.0.3 SWIFT_TEST_ARGS="--parallel"
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.0.3 SWIFT_SNAPSHOT=5.0.3 SWIFT_TEST_ARGS="--parallel"
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.1 SWIFT_TEST_ARGS="--parallel"
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 SWIFT_TEST_ARGS="--parallel"
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.1 KITURA_NIO=1 SWIFT_TEST_ARGS="--parallel"
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 KITURA_NIO=1 SWIFT_TEST_ARGS="--parallel"
     - os: linux
       dist: xenial
       sudo: required
       services: docker
-      env: DOCKER_IMAGE=swift:5.1 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel"
+      env: DOCKER_IMAGE=docker.kitura.net/kitura/swift-ci:5.3.3 SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel"
+
+    # OSX SWIFT_SNAPSHOT should match that of built-in swift otherwise link issues may occur.
     - os: osx
       osx_image: xcode9.2
       sudo: required
@@ -75,14 +77,20 @@ matrix:
     - os: osx
       osx_image: xcode11
       sudo: required
-      env: KITURA_NIO=1 SWIFT_TEST_ARGS="--parallel"
+      env: SWIFT_SNAPSHOT=5.1 KITURA_NIO=1 SWIFT_TEST_ARGS="--parallel"
     - os: osx
-      osx_image: xcode11
+      osx_image: xcode12.2
       sudo: required
-      env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel"
+      env: SWIFT_SNAPSHOT=5.3.1 KITURA_NIO=1 SWIFT_TEST_ARGS="--parallel"
+
+      # Disable non-standard swift builds on macOS due to library path issues.
+      #- os: osx
+      #osx_image: xcode12.2
+      #sudo: required
+      #env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT SWIFT_TEST_ARGS="--parallel"
 
 before_install:
-  - git clone https://github.com/IBM-Swift/Package-Builder.git
+  - git clone https://github.com/Kitura/Package-Builder.git
 
 script:
   - ./Package-Builder/build-package.sh -projectDir $TRAVIS_BUILD_DIR

Tests/KituraTests/KituraTest.swift

@@ -163,18 +163,23 @@ class KituraTest: XCTestCase {
             }
             self.port = port
         }
+
+        var expectations: [XCTestExpectation] = []
+
         let requestQueue = DispatchQueue(label: "Request queue")
         for (index, asyncTask) in asyncTasks.enumerated() {
             let expectation = self.expectation(line: line, index: index)
+            expectations.append(expectation)
             requestQueue.async {
                 asyncTask(expectation)
             }
         }
 
         // wait for timeout or for all created expectations to be fulfilled
-        waitForExpectations(timeout: timeout) { error in
-            XCTAssertNil(error)
-        }
+        wait(for: expectations, timeout: timeout)
+//        waitForExpectations(timeout: timeout) { error in
+//            XCTAssertNil(error)
+//        }
 
         // If we created a short-lived server for specific ServerOptions, shut it down now
         serverWithOptions?.stop()
@@ -367,7 +372,7 @@ class KituraTest: XCTestCase {
     }
 
     func expectation(line: Int, index: Int) -> XCTestExpectation {
-        return self.expectation(description: "\(type(of: self)):\(line)[\(index)](ssl:\(useSSL))")
+        return XCTestExpectation(description: "\(type(of: self)):\(line)[\(index)](ssl:\(useSSL))")
     }
 
     // Generates a unique temporary file path suitable for use as a Unix domain socket.
@@ -388,9 +393,14 @@ class KituraTest: XCTestCase {
     }
 
     // Delete a temporary file path.
-    func removeTemporaryFilePath(_ path: String) {
+    func removeTemporaryFilePath(_ path: String, ignoreIfNotExist: Bool=false) {
         let fileURL = URL(fileURLWithPath: path)
         let fm = FileManager.default
+        if ignoreIfNotExist {
+            guard fm.fileExists(atPath: path) else {
+                return
+            }
+        }
         do {
             try fm.removeItem(at: fileURL)
         } catch {

Tests/KituraTests/TestServer.swift

@@ -271,7 +271,8 @@ final class TestServer: KituraTest, KituraTestSuite {
         // Create a temporary socket path for this server
         let socketPath = uniqueTemporaryFilePath()
         defer {
-            removeTemporaryFilePath(socketPath)
+            // on Kitura.stop(), the socket is removed
+            removeTemporaryFilePath(socketPath, ignoreIfNotExist: true)
         }
 
         let router = Router()