skip signal tests on linux / docker

Author: tomerd

Sources/Basics/Archiver+Zip.swift

@@ -62,15 +62,6 @@ public struct ZipArchiver: Archiver, Cancellable {
         } catch {
             return completion(.failure(error))
         }
-
-        /*
-        Process.popen(arguments: ["unzip", archivePath.pathString, "-d", destinationPath.pathString], queue: .sharedConcurrent) { result in
-            completion(result.tryMap { processResult in
-                guard processResult.exitStatus == .terminated(code: 0) else {
-                    throw try StringError(processResult.utf8stderrOutput())
-                }
-            })
-        }*/
     }
 
     public func validate(path: AbsolutePath, completion: @escaping (Result<Bool, Error>) -> Void) {
@@ -95,13 +86,6 @@ public struct ZipArchiver: Archiver, Cancellable {
         } catch {
             return completion(.failure(error))
         }
-
-        /*
-        Process.popen(arguments: ["unzip", "-t", path.pathString], queue: .sharedConcurrent) { result in
-            completion(result.tryMap { processResult in
-                return processResult.exitStatus == .terminated(code: 0)
-            })
-        }*/
     }
 
     public func cancel(deadline: DispatchTime) throws {

Sources/Basics/DispatchTimeInterval+Extensions.swift

@@ -96,7 +96,7 @@ extension DispatchTimeInterval {
 #if os(Linux) || os(Windows) || os(Android) || os(OpenBSD)
 extension DispatchTime {
     public func distance(to: DispatchTime) -> DispatchTimeInterval {
-        let duration = to.uptimeNanoseconds - self.uptimeNanoseconds
+        let duration = to.uptimeNanoseconds.subtractingReportingOverflow(self.uptimeNanoseconds).partialValue
         return .nanoseconds(duration >= Int.max ? Int.max : Int(duration))
     }
 }

Tests/BasicsTests/CancellatorTests.swift

@@ -42,6 +42,9 @@ final class CancellatorTests: XCTestCase {
     }
 
     func testProcess() throws {
+        #if !os(macOS)
+        try XCTSkipIf(true, "skipping on non-macOS, signal traps do not work well on docker")
+        #endif
         try withTemporaryDirectory { temporaryDirectory in
             let scriptPath = temporaryDirectory.appending(component: "script")
             try localFileSystem.writeFileContents(scriptPath) {
@@ -59,10 +62,13 @@ final class CancellatorTests: XCTestCase {
 
             // outputRedirection used to signal that the process SIGINT traps have been set up
             let startSemaphore = ProcessStartedSemaphore(term: "process started")
-            let process = TSCBasic.Process(arguments: ["bash", scriptPath.pathString], outputRedirection: .stream(
-                stdout: startSemaphore.handleOutput,
-                stderr: startSemaphore.handleOutput
-            ))
+            let process = TSCBasic.Process(
+                arguments: ["bash", scriptPath.pathString],
+                outputRedirection: .stream(
+                    stdout: startSemaphore.handleOutput,
+                    stderr: startSemaphore.handleOutput
+                )
+            )
 
             let registrationKey = cancellator.register(process)
             XCTAssertNotNil(registrationKey)
@@ -93,6 +99,9 @@ final class CancellatorTests: XCTestCase {
     }
 
     func testProcessForceKill() throws {
+        #if !os(macOS)
+        try XCTSkipIf(true, "skipping on non-macOS, signal traps do not work well on docker")
+        #endif
         try withTemporaryDirectory { temporaryDirectory in
             let scriptPath = temporaryDirectory.appending(component: "script")
             try localFileSystem.writeFileContents(scriptPath) {
@@ -119,10 +128,13 @@ final class CancellatorTests: XCTestCase {
 
             // outputRedirection used to signal that the process SIGINT traps have been set up
             let startSemaphore = ProcessStartedSemaphore(term: "trap installed")
-            let process = TSCBasic.Process(arguments: ["bash", scriptPath.pathString], outputRedirection: .stream(
-                stdout: startSemaphore.handleOutput,
-                stderr: startSemaphore.handleOutput
-            ))
+            let process = TSCBasic.Process(
+                arguments: ["bash", scriptPath.pathString],
+                outputRedirection: .stream(
+                    stdout: startSemaphore.handleOutput,
+                    stderr: startSemaphore.handleOutput
+                )
+            )
             let registrationKey = cancellator.register(process)
             XCTAssertNotNil(registrationKey)