Structure expectations so that package registry tests fail fast

Author: mattt

Tests/PackageRegistryTests/RegistryManagerTests.swift

@@ -34,18 +34,21 @@ final class RegistryManagerTests: XCTestCase {
             XCTAssertResultSuccess(result)
         }
 
-        wait(for: [expectation], timeout: 10.0)
+        self.wait(for: [expectation], timeout: 10.0)
     }
 
     func testFetchVersions() {
         let package = PackageReference(identity: "github.com/mona/LinkedList".lowercased(), path: "/LinkedList")
         let expectation = XCTestExpectation(description: "discover package registry")
-        let nestedExpectation = XCTestExpectation(description: "fetch versions")
 
         RegistryManager.discover(for: package) { result in
             defer { expectation.fulfill() }
+
+            XCTAssertResultSuccess(result)
             guard case .success(let manager) = result else { return }
 
+            let nestedExpectation = XCTestExpectation(description: "fetch versions")
+
             manager.fetchVersions(of: package) { result in
                 defer { nestedExpectation.fulfill() }
 
@@ -55,22 +58,27 @@ final class RegistryManagerTests: XCTestCase {
                 XCTAssertEqual(versions, ["1.1.1", "1.0.0"])
                 XCTAssertFalse(versions.contains("1.1.0"), "problematic releases shouldn't be included")
             }
+
+            self.wait(for: [nestedExpectation], timeout: 10.0)
         }
 
-        wait(for: [expectation, nestedExpectation], timeout: 10.0)
+        self.wait(for: [expectation], timeout: 10.0)
     }
 
     func testFetchManifest() {
         let package = PackageReference(identity: "github.com/mona/LinkedList".lowercased(), path: "/LinkedList")
         let expectation = XCTestExpectation(description: "discover package registry")
-        let nestedExpectation = XCTestExpectation(description: "fetch manifest")
 
         RegistryManager.discover(for: package) { result in
             defer { expectation.fulfill() }
+
+            XCTAssertResultSuccess(result)
             guard case .success(let manager) = result else { return }
 
             let manifestLoader = ManifestLoader(manifestResources: Resources.default)
 
+            let nestedExpectation = XCTestExpectation(description: "fetch manifest")
+
             manager.fetchManifest(for: "1.1.1", of: package, using: manifestLoader) { result in
                 defer { nestedExpectation.fulfill() }
 
@@ -91,22 +99,28 @@ final class RegistryManagerTests: XCTestCase {
 
                 XCTAssertEqual(manifest.swiftLanguageVersions, [.v4, .v5])
             }
+
+            self.wait(for: [nestedExpectation], timeout: 10.0)
         }
 
-        wait(for: [expectation, nestedExpectation], timeout: 10.0)
+        self.wait(for: [expectation], timeout: 10.0)
     }
 
     func testDownloadSourceArchive() {
         let package = PackageReference(identity: "github.com/mona/LinkedList".lowercased(), path: "/LinkedList")
         let expectation = XCTestExpectation(description: "discover package registry")
-        let nestedExpectation = XCTestExpectation(description: "fetch manifest")
 
         RegistryManager.discover(for: package) { result in
             defer { expectation.fulfill() }
+
+            XCTAssertResultSuccess(result)
             guard case .success(let manager) = result else { return }
 
             let fs = InMemoryFileSystem()
             let path = AbsolutePath("/LinkedList-1.1.1.zip")
+
+            let nestedExpectation = XCTestExpectation(description: "fetch manifest")
+
             manager.downloadSourceArchive(for: "1.1.1", of: package, into: fs, at: path) { result in
                 defer { nestedExpectation.fulfill() }
 
@@ -118,8 +132,10 @@ final class RegistryManagerTests: XCTestCase {
                     XCTAssertEqual(data, emptyZipFile)
                 }
             }
+
+            self.wait(for: [nestedExpectation], timeout: 10.0)
         }
 
-        wait(for: [expectation, nestedExpectation], timeout: 10.0)
+        self.wait(for: [expectation], timeout: 10.0)
     }
 }