Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
da602e2775 | ||
|
|
5e3b183b9a | ||
|
|
e48c3f6840 | ||
|
|
7751701208 |
@@ -56,23 +56,19 @@ public enum PrinttargArgs {
|
||||
}
|
||||
args.append(contentsOf: ["-R", "\(config.customSeed)"])
|
||||
case .raster:
|
||||
args.append("-r")
|
||||
args.append(contentsOf: ArgsBuilder.flag("-r", when: true))
|
||||
}
|
||||
|
||||
if let label = config.label?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
!label.isEmpty {
|
||||
args.append(contentsOf: ["-d", label])
|
||||
}
|
||||
args.append(contentsOf: ArgsBuilder.optionIfNonEmpty("-d", config.label))
|
||||
|
||||
guard (72...600).contains(config.dpi) else {
|
||||
throw PrinttargArgError.invalidDPI(config.dpi)
|
||||
}
|
||||
args.append(contentsOf: [config.bitDepth.flag, "\(config.dpi)"])
|
||||
|
||||
if !CalibrationIdentity.isCalibration(cleanBasename),
|
||||
let cal = config.calibrationFile?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
!cal.isEmpty {
|
||||
args.append(contentsOf: [config.calibrationEmbedOnly ? "-I" : "-K", cal])
|
||||
if !CalibrationIdentity.isCalibration(cleanBasename) {
|
||||
args.append(contentsOf: ArgsBuilder.optionIfNonEmpty(
|
||||
config.calibrationEmbedOnly ? "-I" : "-K", config.calibrationFile))
|
||||
}
|
||||
|
||||
args.append(cleanBasename)
|
||||
|
||||
@@ -70,18 +70,12 @@ public enum TargenArgs {
|
||||
if let n = config.neutralSteps, n > 0 {
|
||||
args.append(contentsOf: ["-n", "\(n)"])
|
||||
}
|
||||
if let nConc = config.neutralConcentration, abs(nConc - 0.50) >= 0.001 {
|
||||
args.append(contentsOf: ["-N", String(format: "%.2f", locale: Locale(identifier: "en_US_POSIX"), nConc)])
|
||||
}
|
||||
if let c = config.preconditioningProfile?.trimmingCharacters(in: .whitespacesAndNewlines), !c.isEmpty {
|
||||
args.append(contentsOf: ["-c", c])
|
||||
}
|
||||
if config.ofpsHighQuality == true {
|
||||
args.append("-G")
|
||||
}
|
||||
if let a = config.ofpsAdaptation {
|
||||
args.append(contentsOf: ["-A", String(format: "%.2f", locale: Locale(identifier: "en_US_POSIX"), a)])
|
||||
}
|
||||
args.append(contentsOf: ArgsBuilder.optionUnlessApprox("-N", config.neutralConcentration, skip: 0.50))
|
||||
args.append(contentsOf: ArgsBuilder.optionIfNonEmpty("-c", config.preconditioningProfile))
|
||||
args.append(contentsOf: ArgsBuilder.flag("-G", when: config.ofpsHighQuality == true))
|
||||
args.append(contentsOf: ArgsBuilder.option("-A", config.ofpsAdaptation.map {
|
||||
String(format: "%.2f", locale: Locale(identifier: "en_US_POSIX"), $0)
|
||||
}))
|
||||
if let algFlag = config.fullSpreadAlgorithm?.flag {
|
||||
args.append(algFlag)
|
||||
}
|
||||
@@ -91,11 +85,9 @@ public enum TargenArgs {
|
||||
}
|
||||
args.append(contentsOf: ["-l", "\(inkLimit)"])
|
||||
}
|
||||
if let v = config.darkEmphasis, abs(v - 1.0) >= 0.001 {
|
||||
args.append(contentsOf: ["-V", String(format: "%.2f", locale: Locale(identifier: "en_US_POSIX"), v)])
|
||||
}
|
||||
if let p = config.devicePower, p > 0, abs(p - 1.0) >= 0.001 {
|
||||
args.append(contentsOf: ["-p", String(format: "%.2f", locale: Locale(identifier: "en_US_POSIX"), p)])
|
||||
args.append(contentsOf: ArgsBuilder.optionUnlessApprox("-V", config.darkEmphasis, skip: 1.0))
|
||||
if let p = config.devicePower, p > 0 {
|
||||
args.append(contentsOf: ArgsBuilder.optionUnlessApprox("-p", p, skip: 1.0))
|
||||
}
|
||||
|
||||
args.append(cleanBasename)
|
||||
|
||||
@@ -145,9 +145,7 @@ public actor ProcessManager {
|
||||
)
|
||||
let process = prepared.process
|
||||
|
||||
AppLogger(category: "process").debug(
|
||||
"spawn \(id): \(binary.path) \(LogSanitizer.sanitizeArgs(arguments))"
|
||||
)
|
||||
logSpawn(id: id, binary: binary, arguments: arguments, captured: false)
|
||||
|
||||
children[id] = RunningChild(
|
||||
process: process,
|
||||
@@ -214,9 +212,7 @@ public actor ProcessManager {
|
||||
let stdoutPipe = prepared.stdoutPipe
|
||||
let stderrPipe = prepared.stderrPipe
|
||||
|
||||
AppLogger(category: "process").debug(
|
||||
"spawn(captured) \(id): \(binary.path) \(LogSanitizer.sanitizeArgs(arguments))"
|
||||
)
|
||||
logSpawn(id: id, binary: binary, arguments: arguments, captured: true)
|
||||
|
||||
// Register and set up the termination hand-off before run() so
|
||||
// a very fast exit is never missed (#50, #52).
|
||||
@@ -466,6 +462,18 @@ public actor ProcessManager {
|
||||
)
|
||||
}
|
||||
|
||||
private nonisolated func logSpawn(
|
||||
id: String,
|
||||
binary: URL,
|
||||
arguments: [String],
|
||||
captured: Bool
|
||||
) {
|
||||
let prefix = captured ? "spawn(captured)" : "spawn"
|
||||
AppLogger(category: "process").debug(
|
||||
"\(prefix) \(id): \(binary.path) \(LogSanitizer.sanitizeArgs(arguments))"
|
||||
)
|
||||
}
|
||||
|
||||
/// `terminationHandler` can lose a fast-exit race on a loaded host;
|
||||
/// `waitUntilExit` on a detached thread is the fallback (#50, #52).
|
||||
/// The handler is attached before `run()`; the wait thread starts
|
||||
|
||||
@@ -79,16 +79,9 @@ public enum PrintcalArgs {
|
||||
|
||||
var args: [String] = ["-v", "-e"]
|
||||
|
||||
if config.noInkLimit {
|
||||
args.append("-I")
|
||||
}
|
||||
if config.verify {
|
||||
args.append("-z")
|
||||
}
|
||||
if let previous = config.previousCalPath?.trimmingCharacters(in: .whitespacesAndNewlines),
|
||||
!previous.isEmpty {
|
||||
args.append(contentsOf: ["-a", previous])
|
||||
}
|
||||
args.append(contentsOf: ArgsBuilder.flag("-I", when: config.noInkLimit))
|
||||
args.append(contentsOf: ArgsBuilder.flag("-z", when: config.verify))
|
||||
args.append(contentsOf: ArgsBuilder.optionIfNonEmpty("-a", config.previousCalPath))
|
||||
if let tac = config.totalInkLimit, tac > 0 {
|
||||
args.append(contentsOf: ["-m", String(format: "%.1f", tac)])
|
||||
} else if let tac = config.totalInkLimit {
|
||||
|
||||
@@ -0,0 +1,94 @@
|
||||
import Testing
|
||||
import Foundation
|
||||
@testable import ICCeryCore
|
||||
|
||||
@Suite("ArgsBuilder")
|
||||
struct ArgsBuilderTests {
|
||||
|
||||
// MARK: - option
|
||||
|
||||
@Test("option: nil emits nothing")
|
||||
func optionNil() {
|
||||
#expect(ArgsBuilder.option("-f", nil) == [])
|
||||
}
|
||||
|
||||
@Test("option: present value emits flag and value verbatim")
|
||||
func optionPresent() {
|
||||
#expect(ArgsBuilder.option("-f", "abc") == ["-f", "abc"])
|
||||
#expect(ArgsBuilder.option("-f", "") == ["-f", ""])
|
||||
#expect(ArgsBuilder.option("-f", " padded ") == ["-f", " padded "])
|
||||
}
|
||||
|
||||
// MARK: - optionIfNonEmpty
|
||||
|
||||
@Test("optionIfNonEmpty: nil and empty emit nothing")
|
||||
func optionIfNonEmptyNilEmpty() {
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", nil) == [])
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", "") == [])
|
||||
}
|
||||
|
||||
@Test("optionIfNonEmpty: whitespace-only emits nothing")
|
||||
func optionIfNonEmptyWhitespace() {
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", " ") == [])
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", " \t\n ") == [])
|
||||
}
|
||||
|
||||
@Test("optionIfNonEmpty: trims surrounding whitespace")
|
||||
func optionIfNonEmptyTrims() {
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", " label ") == ["-d", "label"])
|
||||
#expect(ArgsBuilder.optionIfNonEmpty("-d", "\tcal.cal\n") == ["-d", "cal.cal"])
|
||||
}
|
||||
|
||||
// MARK: - optionUnlessApprox
|
||||
|
||||
@Test("optionUnlessApprox: nil emits nothing")
|
||||
func optionUnlessApproxNil() {
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-N", nil, skip: 0.50) == [])
|
||||
}
|
||||
|
||||
@Test("optionUnlessApprox: exact skip value emits nothing")
|
||||
func optionUnlessApproxExactSkip() {
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-N", 0.50, skip: 0.50) == [])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-V", 1.0, skip: 1.0) == [])
|
||||
}
|
||||
|
||||
@Test("optionUnlessApprox: within epsilon emits nothing")
|
||||
func optionUnlessApproxWithinEpsilon() {
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-N", 0.5005, skip: 0.50) == [])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-V", 0.9995, skip: 1.0) == [])
|
||||
}
|
||||
|
||||
@Test("optionUnlessApprox: outside epsilon emits flag")
|
||||
func optionUnlessApproxOutsideEpsilon() {
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-N", 0.75, skip: 0.50) == ["-N", "0.75"])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-V", 1.50, skip: 1.0) == ["-V", "1.50"])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-N", 0.498, skip: 0.50) == ["-N", "0.50"])
|
||||
}
|
||||
|
||||
@Test("optionUnlessApprox: POSIX formatting is locale-stable")
|
||||
func optionUnlessApproxPOSIX() {
|
||||
// 1234.5 must never produce a grouping separator or comma decimal.
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-p", 1234.5, skip: 1.0) == ["-p", "1234.50"])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-p", 2.0, skip: 1.0) == ["-p", "2.00"])
|
||||
}
|
||||
|
||||
@Test("optionUnlessApprox: custom epsilon and format honoured")
|
||||
func optionUnlessApproxCustom() {
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-x", 1.005, skip: 1.0, epsilon: 0.01) == [])
|
||||
#expect(ArgsBuilder.optionUnlessApprox("-x", 1.5, skip: 1.0, format: "%.1f") == ["-x", "1.5"])
|
||||
}
|
||||
|
||||
// MARK: - flag
|
||||
|
||||
@Test("flag: true emits the bare flag")
|
||||
func flagTrue() {
|
||||
#expect(ArgsBuilder.flag("-G", when: true) == ["-G"])
|
||||
#expect(ArgsBuilder.flag("-r", when: true) == ["-r"])
|
||||
}
|
||||
|
||||
@Test("flag: false emits nothing")
|
||||
func flagFalse() {
|
||||
#expect(ArgsBuilder.flag("-G", when: false) == [])
|
||||
#expect(ArgsBuilder.flag("-r", when: false) == [])
|
||||
}
|
||||
}
|
||||
@@ -159,6 +159,51 @@ struct ChartreadRowTests {
|
||||
#expect(row.patchCount == 1)
|
||||
#expect(row.patches[0].measured.lab?.l == 51)
|
||||
}
|
||||
|
||||
@Test("Decodes a row carrying both XYZ and Lab arrays")
|
||||
func decodeXYZAndLab() throws {
|
||||
let json = """
|
||||
{"event": "row_complete", "row_id": "B", "row_index": 1, "total_rows": 2,
|
||||
"patch_count": 1, "patches": [
|
||||
{"id": "7", "loc": "B7", "is_pad": false, "device": [10, 20, 30, 40],
|
||||
"measured": {"XYZ": [30.5, 32.1, 25.9], "Lab": [63.4, 2.5, -8.2]}}
|
||||
]}
|
||||
"""
|
||||
let row = try JSONDecoder().decode(ChartreadRow.self, from: Data(json.utf8))
|
||||
let measured = row.patches[0].measured
|
||||
#expect(measured.xyz == CIEXYZ(x: 30.5, y: 32.1, z: 25.9))
|
||||
#expect(measured.lab == CIELab(l: 63.4, a: 2.5, b: -8.2))
|
||||
}
|
||||
|
||||
@Test("XYZColor/CIEXYZ encode as an unkeyed three-number array")
|
||||
func xyzWireEncoding() throws {
|
||||
for color in [XYZColor(x: 1.5, y: 2.5, z: 3.5), CIEXYZ(x: 1.5, y: 2.5, z: 3.5)] {
|
||||
let value = try JSONSerialization.jsonObject(
|
||||
with: JSONEncoder().encode(color))
|
||||
#expect(value as? [Double] == [1.5, 2.5, 3.5])
|
||||
}
|
||||
}
|
||||
|
||||
@Test("LabColor/CIELab encode as an unkeyed three-number array")
|
||||
func labWireEncoding() throws {
|
||||
for color in [LabColor(l: 50, a: -1, b: 2), CIELab(l: 50, a: -1, b: 2)] {
|
||||
let value = try JSONSerialization.jsonObject(
|
||||
with: JSONEncoder().encode(color))
|
||||
#expect(value as? [Double] == [50, -1, 2])
|
||||
}
|
||||
}
|
||||
|
||||
@Test("PatchColor keeps the XYZ and Lab keys over unkeyed arrays")
|
||||
func patchColorKeys() throws {
|
||||
let color = PatchColor(
|
||||
xyz: CIEXYZ(x: 10, y: 20, z: 30),
|
||||
lab: CIELab(l: 55, a: 1, b: -2))
|
||||
let object = try JSONSerialization.jsonObject(
|
||||
with: JSONEncoder().encode(color)) as? [String: Any]
|
||||
#expect(object?["XYZ"] as? [Double] == [10, 20, 30])
|
||||
#expect(object?["Lab"] as? [Double] == [55, 1, -2])
|
||||
#expect(object?["spectral"] == nil)
|
||||
}
|
||||
}
|
||||
|
||||
@Suite("ColourMath")
|
||||
|
||||
@@ -44,6 +44,29 @@ struct PrintcalArgsTests {
|
||||
])
|
||||
}
|
||||
|
||||
@Test("Whitespace-only previous calibration path emits no -a")
|
||||
func whitespacePreviousCal() throws {
|
||||
let config = PrintcalConfig(
|
||||
ti3Basename: "demo",
|
||||
outputURL: tmp,
|
||||
previousCalPath: " \n\t "
|
||||
)
|
||||
let args = try PrintcalArgs.build(config: config)
|
||||
#expect(!args.contains("-a"))
|
||||
#expect(args == ["-v", "-e", "-o", "/tmp/out.cal", "CAL_demo"])
|
||||
}
|
||||
|
||||
@Test("Previous calibration path is trimmed before emission")
|
||||
func previousCalTrimmed() throws {
|
||||
let config = PrintcalConfig(
|
||||
ti3Basename: "demo",
|
||||
outputURL: tmp,
|
||||
previousCalPath: " /tmp/old.cal "
|
||||
)
|
||||
let args = try PrintcalArgs.build(config: config)
|
||||
#expect(args[args.firstIndex(of: "-a")! + 1] == "/tmp/old.cal")
|
||||
}
|
||||
|
||||
@Test("Rejects invalid per-channel limit")
|
||||
func rejectsBadChannelLimit() {
|
||||
let config = PrintcalConfig(
|
||||
|
||||
@@ -131,6 +131,23 @@ struct PrinttargArgsTests {
|
||||
#expect(!args.contains("-I"))
|
||||
}
|
||||
|
||||
@Test("Whitespace-only label emits no -d; whitespace-only calibration emits no -K/-I")
|
||||
func whitespaceOptions() throws {
|
||||
let args = try PrinttargArgs.build(
|
||||
config: config(label: " \n ", calFile: " \t "))
|
||||
#expect(!args.contains("-d"))
|
||||
#expect(!args.contains("-K"))
|
||||
#expect(!args.contains("-I"))
|
||||
}
|
||||
|
||||
@Test("Label and calibration values are trimmed before emission")
|
||||
func trimmedOptions() throws {
|
||||
let args = try PrinttargArgs.build(
|
||||
config: config(label: " My Label ", calFile: " /tmp/a.cal "))
|
||||
#expect(args[args.firstIndex(of: "-d")! + 1] == "My Label")
|
||||
#expect(args[args.firstIndex(of: "-K")! + 1] == "/tmp/a.cal")
|
||||
}
|
||||
|
||||
@Test("Unsafe basename throws")
|
||||
func unsafeBasename() {
|
||||
#expect(throws: PathSecurity.Error.self) {
|
||||
|
||||
@@ -58,6 +58,59 @@ struct ProcessManagerTests {
|
||||
func finish() -> Bool { lock.lock(); defer { lock.unlock() }; if finished { return false }; finished = true; return true }
|
||||
}
|
||||
|
||||
/// Subscribes synchronously (registration happens inside `events()`)
|
||||
/// then records every event for `id` until the task is cancelled.
|
||||
/// Unlike `collect`, observation continues past `.exit` so tests can
|
||||
/// prove exactly-once exit emission.
|
||||
private func observe(
|
||||
_ manager: ProcessManager,
|
||||
id: String,
|
||||
into box: Box
|
||||
) -> Task<Void, Never> {
|
||||
let stream = manager.events()
|
||||
return Task {
|
||||
for await event in stream {
|
||||
guard event.id == id else { continue }
|
||||
box.append(event)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func exitCount(in box: Box) -> Int {
|
||||
box.events.filter { if case .exit = $0 { return true }; return false }.count
|
||||
}
|
||||
|
||||
private func waitForExit(in box: Box, timeout: TimeInterval = 10) async -> Bool {
|
||||
let deadline = Date().addingTimeInterval(timeout)
|
||||
while Date() < deadline {
|
||||
if exitCount(in: box) > 0 { return true }
|
||||
try? await Task.sleep(for: .milliseconds(10))
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
private func waitForFile(_ url: URL, timeout: TimeInterval = 5) async -> Bool {
|
||||
let deadline = Date().addingTimeInterval(timeout)
|
||||
while Date() < deadline {
|
||||
if FileManager.default.fileExists(atPath: url.path) { return true }
|
||||
try? await Task.sleep(for: .milliseconds(10))
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
private func waitForRunning(
|
||||
_ manager: ProcessManager,
|
||||
id: String,
|
||||
timeout: TimeInterval = 5
|
||||
) async -> Bool {
|
||||
let deadline = Date().addingTimeInterval(timeout)
|
||||
while Date() < deadline {
|
||||
if await manager.isRunning(id) { return true }
|
||||
try? await Task.sleep(for: .milliseconds(10))
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
// MARK: - Tests
|
||||
|
||||
@Test func streamsStdoutAndEmitsExit() async throws {
|
||||
@@ -214,6 +267,145 @@ struct ProcessManagerTests {
|
||||
try await pm.sendStdin(id: "nope", text: "d\n")
|
||||
}
|
||||
}
|
||||
|
||||
@Test func explicitPartialFlushEmitsRowColorsJSON() async throws {
|
||||
let pm = ProcessManager()
|
||||
let marker = Self.fixtureDir
|
||||
.appendingPathComponent("partial-row-ready-\(UUID().uuidString)")
|
||||
let bin = try script(
|
||||
"partial-row.sh",
|
||||
"#!/bin/sh\nprintf 'ROW_COLORS_JSON: {\"row\":9}'\ntouch \"$1\"\nsleep 30\n"
|
||||
)
|
||||
let box = Box()
|
||||
let observer = observe(pm, id: "t11", into: box)
|
||||
try await pm.runStreaming(id: "t11", binary: bin, arguments: [marker.path])
|
||||
#expect(await waitForFile(marker))
|
||||
// Retry the flush so the pipe-ingest task can win the actor race
|
||||
// on a loaded host; the first successful flush emits the row.
|
||||
var flushed = false
|
||||
for _ in 0..<50 {
|
||||
await pm.flushPartialLine(id: "t11")
|
||||
if box.events.contains(where: { if case .jsonRow = $0 { return true }; return false }) {
|
||||
flushed = true
|
||||
break
|
||||
}
|
||||
try await Task.sleep(for: .milliseconds(20))
|
||||
}
|
||||
#expect(flushed)
|
||||
await pm.kill(id: "t11")
|
||||
#expect(await waitForExit(in: box))
|
||||
observer.cancel()
|
||||
let events = box.events
|
||||
let rows = events.compactMap { e -> String? in
|
||||
if case .jsonRow(_, let d) = e { return String(decoding: d, as: UTF8.self) }
|
||||
return nil
|
||||
}
|
||||
#expect(rows == ["{\"row\":9}"])
|
||||
// Prefixed tails must not leak into stdout, even via finalize.
|
||||
#expect(!events.contains(.stdout(id: "t11", line: "ROW_COLORS_JSON: {\"row\":9}")))
|
||||
#expect(exitCount(in: box) == 1)
|
||||
}
|
||||
|
||||
@Test func unterminatedRowTailFinalizesAsJSONRow() async throws {
|
||||
let pm = ProcessManager()
|
||||
let bin = try script(
|
||||
"row-tail.sh",
|
||||
"#!/bin/sh\nprintf 'ROW_COLORS_JSON: {\"row\":42}'\n"
|
||||
)
|
||||
let box = Box()
|
||||
let observer = observe(pm, id: "t12", into: box)
|
||||
try await pm.runStreaming(id: "t12", binary: bin, arguments: [])
|
||||
#expect(await waitForExit(in: box))
|
||||
observer.cancel()
|
||||
let events = box.events
|
||||
let rows = events.compactMap { e -> String? in
|
||||
if case .jsonRow(_, let d) = e { return String(decoding: d, as: UTF8.self) }
|
||||
return nil
|
||||
}
|
||||
#expect(rows == ["{\"row\":42}"])
|
||||
#expect(!events.contains(.stdout(id: "t12", line: "ROW_COLORS_JSON: {\"row\":42}")))
|
||||
let rowIndex = events.firstIndex {
|
||||
if case .jsonRow = $0 { return true }; return false
|
||||
}
|
||||
let exitIndexes = events.indices.filter {
|
||||
if case .exit = events[$0] { return true }; return false
|
||||
}
|
||||
#expect(exitIndexes.count == 1)
|
||||
if let rowIndex, let exitIndex = exitIndexes.first {
|
||||
#expect(rowIndex < exitIndex)
|
||||
} else {
|
||||
Issue.record("expected a jsonRow before the exit event")
|
||||
}
|
||||
}
|
||||
|
||||
@Test func fastStreamingExitEmitsExactlyOneExit() async throws {
|
||||
let pm = ProcessManager()
|
||||
let bin = try script("fast-stream.sh", "#!/bin/sh\nexit 0\n")
|
||||
let box = Box()
|
||||
let observer = observe(pm, id: "t13", into: box)
|
||||
try await pm.runStreaming(id: "t13", binary: bin, arguments: [])
|
||||
#expect(await waitForExit(in: box))
|
||||
// The grace window must outlast the 2 s finalize watchdog so a
|
||||
// duplicate emission from it would be observed.
|
||||
try await Task.sleep(for: .milliseconds(2500))
|
||||
observer.cancel()
|
||||
#expect(box.events == [.exit(id: "t13", code: 0)])
|
||||
}
|
||||
|
||||
@Test func fastCapturedExitEmitsExactlyOneExit() async throws {
|
||||
let pm = ProcessManager()
|
||||
let bin = try script("fast-cap.sh", "#!/bin/sh\nexit 7\n")
|
||||
let box = Box()
|
||||
let observer = observe(pm, id: "t14", into: box)
|
||||
let result = try await pm.runCaptured(id: "t14", binary: bin, arguments: [])
|
||||
#expect(result.exitCode == 7)
|
||||
// Both the termination handler and the waitUntilExit watchdog
|
||||
// resume the same box; give the slower path time to fire.
|
||||
try await Task.sleep(for: .milliseconds(500))
|
||||
observer.cancel()
|
||||
#expect(box.events == [.exit(id: "t14", code: 7)])
|
||||
}
|
||||
|
||||
@Test func capturedRunSetsArgyllNotInteractive() async throws {
|
||||
let pm = ProcessManager()
|
||||
let bin = try script(
|
||||
"cap-env.sh",
|
||||
"#!/bin/sh\necho \"ANI=$ARGYLL_NOT_INTERACTIVE\"\n"
|
||||
)
|
||||
let result = try await pm.runCaptured(id: "t15", binary: bin, arguments: [])
|
||||
#expect(result.stdout == "ANI=1\n")
|
||||
}
|
||||
|
||||
@Test func killAllTerminatesStreamingAndCapturedChildren() async throws {
|
||||
let pm = ProcessManager()
|
||||
let marker = Self.fixtureDir
|
||||
.appendingPathComponent("mixed-cap-ready-\(UUID().uuidString)")
|
||||
let slowBin = try script("mixed-slow.sh", "#!/bin/sh\nsleep 30\n")
|
||||
let capBin = try script("mixed-cap.sh", "#!/bin/sh\ntouch \"$1\"\nsleep 30\n")
|
||||
let streamBox = Box()
|
||||
let capBox = Box()
|
||||
let streamObserver = observe(pm, id: "t16", into: streamBox)
|
||||
let capObserver = observe(pm, id: "t17", into: capBox)
|
||||
try await pm.runStreaming(id: "t16", binary: slowBin, arguments: [])
|
||||
let capTask = Task {
|
||||
try await pm.runCaptured(id: "t17", binary: capBin, arguments: [marker.path])
|
||||
}
|
||||
#expect(await waitForFile(marker))
|
||||
#expect(await waitForRunning(pm, id: "t16"))
|
||||
#expect(await waitForRunning(pm, id: "t17"))
|
||||
#expect(await pm.killAll() == 2)
|
||||
_ = try await capTask.value
|
||||
#expect(await waitForExit(in: streamBox))
|
||||
#expect(await waitForExit(in: capBox))
|
||||
// Grace window outlasts the streaming finalize watchdog.
|
||||
try await Task.sleep(for: .milliseconds(2500))
|
||||
streamObserver.cancel()
|
||||
capObserver.cancel()
|
||||
#expect(!(await pm.isRunning("t16")))
|
||||
#expect(!(await pm.isRunning("t17")))
|
||||
#expect(exitCount(in: streamBox) == 1)
|
||||
#expect(exitCount(in: capBox) == 1)
|
||||
}
|
||||
}
|
||||
|
||||
@Suite("ProcessLineDecoder")
|
||||
|
||||
@@ -162,6 +162,34 @@ struct TargenArgsTests {
|
||||
#expect(!args.contains("-p"))
|
||||
}
|
||||
|
||||
@Test("Whitespace-only preconditioning profile emits no -c")
|
||||
func whitespacePreconditioner() throws {
|
||||
let config = TargenConfig(
|
||||
colourSpace: .rgb,
|
||||
patchCount: 800,
|
||||
whitePatches: 4,
|
||||
blackPatches: 4,
|
||||
preconditioningProfile: " \n\t ",
|
||||
basename: "ws_pre"
|
||||
)
|
||||
let args = try TargenArgs.build(config: config)
|
||||
#expect(!args.contains("-c"))
|
||||
}
|
||||
|
||||
@Test("Preconditioning profile is trimmed before emission")
|
||||
func preconditionerTrimmed() throws {
|
||||
let config = TargenConfig(
|
||||
colourSpace: .rgb,
|
||||
patchCount: 800,
|
||||
whitePatches: 4,
|
||||
blackPatches: 4,
|
||||
preconditioningProfile: " /path/to/profile.icc ",
|
||||
basename: "trim_pre"
|
||||
)
|
||||
let args = try TargenArgs.build(config: config)
|
||||
#expect(args[args.firstIndex(of: "-c")! + 1] == "/path/to/profile.icc")
|
||||
}
|
||||
|
||||
@Test("Invalid basename throws")
|
||||
func invalidBasenameThrows() {
|
||||
let config = TargenConfig(
|
||||
|
||||
Reference in New Issue
Block a user