@@ -132,6 +132,20 @@ extension RunnerTests {
132132 ]
133133
134134 static let flatInteractiveFallbackBudget : TimeInterval = 1.0
135+ /// The least slice time a sweep query may start with. XCTest cannot cancel a query, so one that
136+ /// starts later outlives the slice its caller waits for and holds the main thread (#2783).
137+ static let flatInteractiveQueryBudget : TimeInterval = 0.1
138+
139+ /// The deadline the query-sweep tier's caller waits for: one slice, clamped to the plan deadline.
140+ /// Interactive and non-interactive requests share it, since the caller discards a later result.
141+ static func querySweepSliceDeadline ( startedAt : Date , planDeadline : Date ) -> Date {
142+ min ( startedAt . addingTimeInterval ( flatInteractiveFallbackBudget ) , planDeadline )
143+ }
144+
145+ /// Whether a sweep query started at `now` can still finish before the slice `deadline`.
146+ static func querySweepCanStartQuery ( deadline : Date , now : Date ) -> Bool {
147+ deadline . timeIntervalSince ( now ) >= flatInteractiveQueryBudget
148+ }
135149
136150 /// What one capture may spend reading the keyboard band before it gives up on the fact and lets the
137151 /// tap guard fall back to the tree rule. The scroll path pays this query per gesture and stays well
@@ -424,7 +438,7 @@ extension RunnerTests {
424438 func querySweepSnapshotAcquisition (
425439 app : XCUIApplication ,
426440 hint : CaptureHint ,
427- planDeadline : Date = . distantFuture
441+ sliceDeadline deadline : Date
428442 ) -> SnapshotAcquisition {
429443 var nodes : [ RawAXNode ] = [
430444 interactiveRootNode ( rect : . zero )
@@ -440,19 +454,13 @@ extension RunnerTests {
440454 )
441455 }
442456
443- // Bounded by both its own sweep budget and the umbrella capture-plan deadline, so a
444- // chained recovery tier can never push the plan past the main-thread watchdog (#1105).
445- let sweepDeadline = hint . interactiveOnly
446- ? Date ( ) . addingTimeInterval ( Self . flatInteractiveFallbackBudget )
447- : Date . distantFuture
448- let deadline = min ( sweepDeadline , planDeadline )
449457 let viewport = safeSnapshotViewport ( app : app )
450458 var seen = Set < String > ( )
451459 var candidates : [ RawAXNode ] = [ ]
452460 let flatElements = flatInteractiveElements ( app : app , deadline : deadline )
453461 var truncated = flatElements . truncated
454462 for element in flatElements . elements {
455- if Date ( ) >= deadline {
463+ if ! Self . querySweepCanStartQuery ( deadline : deadline , now : Date ( ) ) {
456464 NSLog ( " AGENT_DEVICE_RUNNER_SNAPSHOT_FLAT_FALLBACK_DEADLINE " )
457465 truncated = true
458466 break
@@ -677,6 +685,78 @@ extension RunnerTests {
677685 XCTAssertEqual ( runnerAccessibilityHealth , . unavailable )
678686 }
679687
688+ func testQuerySweepSliceDeadlineIsTheTierSliceNotThePlanDeadline ( ) {
689+ let startedAt = Date ( timeIntervalSinceReferenceDate : 1_000 )
690+ let slice = startedAt . addingTimeInterval ( Self . flatInteractiveFallbackBudget )
691+
692+ XCTAssertEqual (
693+ Self . querySweepSliceDeadline (
694+ startedAt : startedAt ,
695+ planDeadline : startedAt . addingTimeInterval ( Self . snapshotPlanBudget )
696+ ) ,
697+ slice
698+ )
699+ let nearPlanDeadline = startedAt . addingTimeInterval ( Self . flatInteractiveFallbackBudget / 2 )
700+ XCTAssertEqual (
701+ Self . querySweepSliceDeadline ( startedAt : startedAt , planDeadline : nearPlanDeadline ) ,
702+ nearPlanDeadline
703+ )
704+ }
705+
706+ func testQuerySweepStopsAtTheSliceDeadlineBeforeAQueryThatCannotFinish ( ) {
707+ let startedAt = Date ( timeIntervalSinceReferenceDate : 1_000 )
708+ let sliceDeadline = Self . querySweepSliceDeadline (
709+ startedAt : startedAt ,
710+ planDeadline : startedAt . addingTimeInterval ( Self . snapshotPlanBudget )
711+ )
712+ var clock = startedAt
713+ var startedQueries : [ Int ] = [ ]
714+
715+ let sweep = Self . runFlatInteractiveQueries (
716+ Array ( 0 ..< 19 ) ,
717+ deadline : sliceDeadline ,
718+ now : { clock }
719+ ) { query -> ( elements : [ Int ] , axUnavailable : Bool ) in
720+ startedQueries . append ( query )
721+ clock = clock . addingTimeInterval ( 0.475 )
722+ return ( [ query ] , false )
723+ }
724+
725+ XCTAssertEqual ( startedQueries , [ 0 , 1 ] , " a query must not start with less than one query budget left " )
726+ XCTAssertEqual ( sweep . elements , [ 0 , 1 ] )
727+ XCTAssertTrue ( sweep . truncated )
728+ XCTAssertLessThanOrEqual ( clock , sliceDeadline , " no started query may outlive the tier slice " )
729+
730+ XCTAssertTrue (
731+ Self . querySweepCanStartQuery ( deadline : sliceDeadline , now : sliceDeadline . addingTimeInterval ( - 0.2 ) )
732+ )
733+ XCTAssertFalse (
734+ Self . querySweepCanStartQuery ( deadline : sliceDeadline , now : sliceDeadline . addingTimeInterval ( - 0.05 ) )
735+ )
736+ XCTAssertFalse ( Self . querySweepCanStartQuery ( deadline : sliceDeadline , now : sliceDeadline ) )
737+ }
738+
739+ func testQuerySweepRunsEveryQueryThatFitsAndStopsOnAXUnavailable ( ) {
740+ let startedAt = Date ( timeIntervalSinceReferenceDate : 1_000 )
741+ let deadline = startedAt . addingTimeInterval ( Self . flatInteractiveFallbackBudget )
742+
743+ let complete = Self . runFlatInteractiveQueries (
744+ [ 0 , 1 , 2 ] ,
745+ deadline : deadline ,
746+ now : { startedAt }
747+ ) { query -> ( elements : [ Int ] , axUnavailable : Bool ) in ( [ query ] , false ) }
748+ XCTAssertEqual ( complete . elements , [ 0 , 1 , 2 ] )
749+ XCTAssertFalse ( complete . truncated )
750+
751+ let rejected = Self . runFlatInteractiveQueries (
752+ [ 0 , 1 , 2 ] ,
753+ deadline : deadline ,
754+ now : { startedAt }
755+ ) { query -> ( elements : [ Int ] , axUnavailable : Bool ) in ( [ query ] , query == 1 ) }
756+ XCTAssertEqual ( rejected . elements , [ 0 , 1 ] )
757+ XCTAssertFalse ( rejected . truncated )
758+ }
759+
680760 func testRecoveredSnapshotMessagePreservesHint ( ) {
681761 let message = recoveredSnapshotMessage (
682762 SnapshotCaptureFailure (
0 commit comments