Skip to content

fix(tests): stop persistence cleanup from throwing on unlinked sockets #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Aforno wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(tests): stop persistence cleanup from throwing on unlinked sockets #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 26 additions & 11 deletions Tests/AgentsNotchTests/SessionPersistenceTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@testable import AgentsNotch
import AgentsNotchCore
import Darwin
import Foundation
import XCTest

Expand Down Expand Up @@ -73,6 +74,7 @@ final class SessionPersistenceTests: XCTestCase {
)
await runtime.start()
defer { runtime.stop() }
try await fixture.waitForSocket()

try UnixSocketClient.send(AgentEvent(
protocolVersion: 2,
Expand All @@ -81,8 +83,11 @@ final class SessionPersistenceTests: XCTestCase {
provider: .codex,
state: .running
), to: fixture.socketURL)
try await Task.sleep(for: .milliseconds(150))
for _ in 0..<50 where !runtime.activity.protocolMismatchDetected {
try await Task.sleep(for: .milliseconds(10))
}

XCTAssertTrue(runtime.activity.protocolMismatchDetected)
XCTAssertTrue(runtime.activity.sessions.isEmpty)
XCTAssertNil(runtime.lastEventReceivedAt[.codex])

Expand All @@ -92,7 +97,7 @@ final class SessionPersistenceTests: XCTestCase {
provider: .codex,
state: .running
), to: fixture.socketURL)
for _ in 0..<30 where runtime.lastEventReceivedAt[.codex] == nil {
for _ in 0..<50 where runtime.lastEventReceivedAt[.codex] == nil {
try await Task.sleep(for: .milliseconds(10))
}

Expand All @@ -112,9 +117,7 @@ final class SessionPersistenceTests: XCTestCase {
)
let startTask = Task { await runtime.start() }

for _ in 0..<30 where !FileManager.default.fileExists(atPath: fixture.socketURL.path) {
try await Task.sleep(for: .milliseconds(10))
}
try await fixture.waitForSocket()
try UnixSocketClient.send(AgentEvent(
type: .activity,
sessionId: "codex:startup-event",
Expand Down Expand Up @@ -475,16 +478,28 @@ private final class PersistenceFixture: @unchecked Sendable {

init() throws {
root = FileManager.default.temporaryDirectory
.appendingPathComponent("AgentsNotchPersistenceTests-\(UUID().uuidString)", isDirectory: true)
.appendingPathComponent("an-p-\(UUID().uuidString.prefix(8))", isDirectory: true)
fileURL = root.appendingPathComponent("sessions.json")
socketURL = FileManager.default.temporaryDirectory
.appendingPathComponent("an-\(UUID().uuidString.prefix(8)).sock")
socketURL = root.appendingPathComponent("agent.sock")
try FileManager.default.createDirectory(at: root, withIntermediateDirectories: true)
}

func waitForSocket() async throws {
for _ in 0..<50 where !FileManager.default.fileExists(atPath: socketURL.path) {
try await Task.sleep(for: .milliseconds(10))
}
XCTAssertTrue(
FileManager.default.fileExists(atPath: socketURL.path),
"event socket was not created at \(socketURL.path)"
)
}

/// Unlink the socket first. FileManager.removeItem throws if stop() already removed the path.
func remove() {
try? FileManager.default.removeItem(at: root)
try? FileManager.default.removeItem(at: socketURL)
try? FileManager.default.removeItem(atPath: socketURL.path + ".lock")
_ = unlink(socketURL.path)
_ = unlink(socketURL.path + ".lock")
do {
try FileManager.default.removeItem(at: root)
} catch {}
}
}
Loading