Skip to content

Fix display harness manifest handoff in UI test #1724

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

Merged
lawrencecchen merged 7 commits into from
Mar 18, 2026
Merged

Fix display harness manifest handoff in UI test #1724

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b1e2d1c
Pass display harness manifest path into UI test
lawrencecchen Mar 18, 2026
95cd26c
Restore stable display harness manifest path
lawrencecchen Mar 18, 2026
1c6d556
Move display harness rendezvous files to /tmp
lawrencecchen Mar 18, 2026
7fb1f50
Launch display helper from inside the UI test sandbox
lawrencecchen Mar 18, 2026
fbe209c
Read the prebuilt display helper path from the harness manifest
lawrencecchen Mar 18, 2026
34a5f71
Merge remote-tracking branch 'origin/main' into feat-display-harness-…
lawrencecchen Mar 18, 2026
e99bc40
Fix test target build after split test sync
lawrencecchen Mar 18, 2026
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,6 +513,7 @@ jobs:
CMUX_UI_TEST_DISPLAY_START_PATH="$START_PATH" \
CMUX_UI_TEST_DISPLAY_DONE_PATH="$DONE_PATH" \
CMUX_UI_TEST_DISPLAY_LOG_PATH="$LOG_PATH" \
CMUX_UI_TEST_DISPLAY_HARNESS_MANIFEST_PATH="$MANIFEST_PATH" \
xcodebuild -project GhosttyTabs.xcodeproj -scheme cmux -configuration Debug \
-clonedSourcePackagesDirPath "$SOURCE_PACKAGES_DIR" \
-disableAutomaticPackageResolution \
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/test-e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ jobs:
CMUX_UI_TEST_DISPLAY_START_PATH="$START_PATH"
CMUX_UI_TEST_DISPLAY_DONE_PATH="$DONE_PATH"
CMUX_UI_TEST_DISPLAY_LOG_PATH="$LOG_PATH"
CMUX_UI_TEST_DISPLAY_HARNESS_MANIFEST_PATH="$MANIFEST_PATH"
)
fi

Expand Down
9 changes: 5 additions & 4 deletions cmuxUITests/DisplayResolutionRegressionUITests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import XCTest
import Foundation

final class DisplayResolutionRegressionUITests: XCTestCase {
private let displayHarnessManifestPath = "/tmp/cmux-ui-test-display-harness.json"
private let defaultDisplayHarnessManifestPath = "/tmp/cmux-ui-test-display-harness.json"
private var launchTag = ""
private var diagnosticsPath = ""
private var displayReadyPath = ""
Expand Down Expand Up @@ -118,7 +118,7 @@ final class DisplayResolutionRegressionUITests: XCTestCase {

private func prepareDisplayHarnessIfNeeded() throws {
let env = ProcessInfo.processInfo.environment
if let externalHarness = loadExternalHarnessFromEnvironment(env) ?? loadExternalHarnessFromManifest() {
if let externalHarness = loadExternalHarnessFromEnvironment(env) ?? loadExternalHarnessFromManifest(env) {
displayReadyPath = externalHarness.readyPath
displayIDPath = externalHarness.displayIDPath
displayStartPath = externalHarness.startPath
Expand Down Expand Up @@ -150,8 +150,9 @@ final class DisplayResolutionRegressionUITests: XCTestCase {
)
}

private func loadExternalHarnessFromManifest() -> ExternalDisplayHarness? {
let manifestURL = URL(fileURLWithPath: displayHarnessManifestPath)
private func loadExternalHarnessFromManifest(_ env: [String: String]) -> ExternalDisplayHarness? {
let manifestPath = env["CMUX_UI_TEST_DISPLAY_HARNESS_MANIFEST_PATH"] ?? defaultDisplayHarnessManifestPath
let manifestURL = URL(fileURLWithPath: manifestPath)
guard let data = try? Data(contentsOf: manifestURL) else {
return nil
}
Expand Down
Loading