Wait for remote cache store request

avito-tech · May 11, 2020 · aabbf03 · aabbf03
1 parent 58a5c19
commit aabbf03
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 0 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1577,6 +1577,7 @@ let package = Package(
             name: "TestDiscovery",
             dependencies: [
                 "AppleTools",
+                "AtomicModels",
                 "BuildArtifacts",
                 "DeveloperDirLocator",
                 "Extensions",

diff --git a/Sources/TestDiscovery/RuntimeDumpRemoteCache/DefaultRuntimeDumpRemoteCache.swift b/Sources/TestDiscovery/RuntimeDumpRemoteCache/DefaultRuntimeDumpRemoteCache.swift
@@ -1,3 +1,4 @@
+import AtomicModels
 import BuildArtifacts
 import Foundation
 import Logging
@@ -58,12 +59,19 @@ class DefaultRuntimeDumpRemoteCache: RuntimeDumpRemoteCache {
             payload: tests
         )
 
+        let didFinishRequest = AtomicValue(false)
+
         sender.sendRequestWithCallback(
             request: request,
             credentials: config.credentials,
             callbackQueue: callbackQueue
         ) { (result: Either<VoidPayload, RequestSenderError>) in
             Logger.verboseDebug("Stored runtime query with result: \(result)")
+            didFinishRequest.set(true)
+        }
+
+        try waiter.waitWhile(timeout: 20.0, description: "Runtime Dump Remote Cache Store") { () -> Bool in
+            didFinishRequest.currentValue() == false
         }
     }
 

diff --git a/Tests/TestDiscoveryTests/RuntimeDumpRemoteCacheTests.swift b/Tests/TestDiscoveryTests/RuntimeDumpRemoteCacheTests.swift
@@ -23,6 +23,7 @@ class RuntimeDumpRemoteCacheTests: XCTestCase {
         let expectedPath = "/pathToRemoteStorage/a74c1c98661e4c27fc3e569f40c74feaf4775d1b77c4a82928364728ab6c23b0.json"
         let queryResult = TestDiscoveryResultFixtures.queryResult()
 
+        requestSender.result = VoidPayload()
         try cache.store(
             tests: queryResult.discoveredTests,
             xcTestBundleLocation: xcTestBundleLocation