marketing-shibata50/cmux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stabilize notify focus UI test socket and surface waits

Browse source
This commit is contained in:
Lawrence Chen 2026-03-05 03:14:52 -08:00
parent c8487e1457
commit 69cfce9596
1 changed files with 17 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

23
cmuxUITests/MultiWindowNotificationsUITests.swift
View file

@ -229,8 +229,8 @@ final class MultiWindowNotificationsUITests: XCTestCase {
return
}
guard let surfaceId = firstSurfaceId(forWorkspaceId: tabId2) else {
XCTFail("Expected at least one surface in workspace \(tabId2)")
guard let surfaceId = waitForSurfaceId(forWorkspaceId: tabId2, timeout: 12.0) else {
XCTFail("Expected at least one surface in workspace \(tabId2). socket=\(socketPath)")
return
}
@ -385,6 +385,17 @@ final class MultiWindowNotificationsUITests: XCTestCase {
return nil
}
private func waitForSurfaceId(forWorkspaceId workspaceId: String, timeout: TimeInterval) -> String? {
let deadline = Date().addingTimeInterval(timeout)
while Date() < deadline {
if let surfaceId = firstSurfaceId(forWorkspaceId: workspaceId) {
return surfaceId
}
RunLoop.current.run(until: Date().addingTimeInterval(0.05))
}
return firstSurfaceId(forWorkspaceId: workspaceId)
}
private func runCmuxNotify(
socketPath: String,
workspaceId: String,
@ -498,8 +509,9 @@ final class MultiWindowNotificationsUITests: XCTestCase {
while Date() < deadline {
for candidate in primaryCandidates {
guard FileManager.default.fileExists(atPath: candidate) else { continue }
if socketRespondsToPing(at: candidate),
socketMatchesRequiredWorkspace(candidate, workspaceId: requiredWorkspaceId) {
// Primary candidate is the explicitly requested CMUX_SOCKET_PATH. If it responds,
// prefer it even before workspace contents are fully initialized.
if socketRespondsToPing(at: candidate) {
return candidate
}
}
@ -514,8 +526,7 @@ final class MultiWindowNotificationsUITests: XCTestCase {
}
for candidate in primaryCandidates {
guard FileManager.default.fileExists(atPath: candidate) else { continue }
if socketRespondsToPing(at: candidate),
socketMatchesRequiredWorkspace(candidate, workspaceId: requiredWorkspaceId) {
if socketRespondsToPing(at: candidate) {
return candidate
}
}