Add new test for signal delaying with block

Author: Frizlab

Sources/signal-handling-tests-helper/DelaySignalBlock.swift

@@ -0,0 +1,42 @@
+import Foundation
+
+import ArgumentParser
+import CLTLogger
+import Logging
+import SystemPackage
+
+import SignalHandling
+
+
+
+struct DelaySignalBlock : ParsableCommand {
+	
+	@Option
+	var signalNumber: CInt
+	
+	func run() throws {
+		try SigactionDelayer_Block.bootstrap(for: [Signal(rawValue: signalNumber)])
+		
+		LoggingSystem.bootstrap{ _ in CLTLogger() }
+		SignalHandlingConfig.logger?.logLevel = .trace
+		
+		let signal = Signal(rawValue: signalNumber)
+		
+		try Sigaction(handler: .ansiC({ _ in writeToStdout("in sigaction handler") })).install(on: signal)
+		
+		_ = try SigactionDelayer_Block.registerDelayedSigaction(signal, handler: { _, doneHandler in
+			DispatchQueue.global().asyncAfter(deadline: .now() + .milliseconds(500), execute: {
+				writeToStdout("allowing signal to be resent")
+				doneHandler(true)
+			})
+		})
+		
+		Thread.sleep(until: .distantFuture)
+	}
+	
+}
+
+/* Using print does not work in Terminal probably due to buffering. */
+private func writeToStdout(_ str: String) {
+	try! FileDescriptor.standardOutput.writeAll(Data((str + "\n").utf8))
+}

Sources/signal-handling-tests-helper/DelaySignalUnsigaction.swift

@@ -15,7 +15,6 @@ struct DelaySignalUnsigaction : ParsableCommand {
 	var signalNumber: CInt
 
 	func run() throws {
-//		try SigactionDelayer_Block.bootstrap(for: [Signal(rawValue: signalNumber)])
 		LoggingSystem.bootstrap{ _ in CLTLogger() }
 		SignalHandlingConfig.logger?.logLevel = .trace
 

Sources/signal-handling-tests-helper/main.swift

@@ -11,6 +11,7 @@ struct SignalHandlingTestsHelper : ParsableCommand {
 		subcommands: [
 			ManualTest.self,
 			ManualDispatchMemTest.self,
+			DelaySignalBlock.self,
 			DelaySignalUnsigaction.self
 		]
 	)

Tests/SignalHandlingTests/SignalHandlingTests.swift

@@ -22,7 +22,7 @@ final class SignalHandlingTests : XCTestCase {
 		SignalHandlingConfig.logger?.logLevel = .trace
 	}
 
-	func testBasicUnsigaction() throws {
+	func testBasicSignalDelayByUnsigaction() throws {
 		let pipe = Pipe()
 
 		let p = Process()
@@ -48,6 +48,32 @@ final class SignalHandlingTests : XCTestCase {
 			""".utf8))
 	}
 
+	func testBasicSignalDelayByBlock() throws {
+		let pipe = Pipe()
+		
+		let p = Process()
+		p.standardOutput = pipe
+		p.executableURL = Self.helperURL
+		p.arguments = ["delay-signal-block", "--signal-number", "\(Signal.terminated.rawValue)"]
+		
+		try p.run()
+		
+		Thread.sleep(forTimeInterval: 0.125) /* If we go too soon, the handler are not installed yet */
+		kill(p.processIdentifier, Signal.terminated.rawValue)
+		
+		Thread.sleep(forTimeInterval: 0.750)
+		kill(p.processIdentifier, Signal.interrupt.rawValue)
+		
+		let data = try pipe.fileHandleForReading.readToEnd()
+		p.waitUntilExit()
+		
+		XCTAssertEqual(data, Data("""
+			allowing signal to be resent
+			in sigaction handler
+			
+			""".utf8))
+	}
+	
 	/** Returns the path to the built products directory. */
 	private static var productsDirectory: URL {
 		#if os(macOS)