Skip to content
Merged
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -29,20 +29,6 @@ struct ClassicUpgradeSimulationTests {
String(describing: launch.outcome?.decision ?? .skip(.disabled))))
}

/// Quarantine (#28425): `multiWindow`'s order and group checks flake while the sidebar placements a
/// run queues trail it on a loaded runner (#26153), so they are a known issue for that one case.
/// The fix, #28362, removes this.
private static func verifyQuarantined(_ sim: ClassicUpgradeSimulator, _ profile: ClassicUpgradeProfile,
classicBefore before: [String: String],
sourceLocation: SourceLocation = #_sourceLocation) throws {
guard profile.name == "multiWindow" else {
return try sim.verify(profile, classicBefore: before, sourceLocation: sourceLocation)
}
withKnownIssue("#28425: sidebar placements trail the run; fixed by #28362", isIntermittent: true, sourceLocation: sourceLocation) {
try sim.verify(profile, classicBefore: before, sourceLocation: sourceLocation)
}
}

/// The matrix: the first launch brings everything once; relaunching and the
/// import action make nothing more.
@Test(arguments: ["fresh", "small", "manyGroups", "nestedSplits", "browsersAndViewers", "multiWindow", "oldSchema", "messy"])
Expand All @@ -56,14 +42,14 @@ struct ClassicUpgradeSimulationTests {
#expect(launch.failure == nil, "\(String(describing: launch.failure))")
#expect(launch.outcome?.decision == .firstRun, "\(String(describing: launch.outcome))")
await sim.settle()
try Self.verifyQuarantined(sim, profile, classicBefore: before)
try sim.verify(profile, classicBefore: before)

let again = try await sim.relaunch()
#expect(again.decision == .skip(.unchanged) && again.opened.isEmpty, "\(again)")
let manual = try await sim.manualImport()
#expect(manual.opened.isEmpty, "\(manual)")
await sim.settle()
try Self.verifyQuarantined(sim, profile, classicBefore: before)
try sim.verify(profile, classicBefore: before)
await sim.shutdown()
}

Expand Down
Loading