Merge pull request #65096 from apple/ktoso-patch-14

kavon · web-flow · commit bc9f9e1b46ee · 2023-04-12T11:50:41.000-07:00
[5.9][Executors] update assertion in distributed_actor_executor_asserts.swift
diff --git a/test/Distributed/Runtime/distributed_actor_executor_asserts.swift b/test/Distributed/Runtime/distributed_actor_executor_asserts.swift
@@ -83,7 +83,7 @@ actor EnqueueTest {
       }
 
       tests.test("remote actor reference should have crash-on-enqueue executor") {
-        expectCrashLater(withMessage: "Attempted to enqueue Job (Job(id: 1)) on executor of remote distributed actor reference!")
+        expectCrashLater(withMessage: "Attempted to enqueue ExecutorJob (ExecutorJob(id: 1)) on executor of remote distributed actor reference!")
         // we do the bad idea of taking an executor from a remote worker
         // and then force another actor to run on it; this will cause an enqueue on the "crash on enqueue" executor.
         let wrongUse = EnqueueTest(unownedExecutor: normalRemoteWorker.unownedExecutor)

Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ actor EnqueueTest {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`tests.test("remote actor reference should have crash-on-enqueue executor") {`
`86`		`- expectCrashLater(withMessage: "Attempted to enqueue Job (Job(id: 1)) on executor of remote distributed actor reference!")`
	`86`	`+ expectCrashLater(withMessage: "Attempted to enqueue ExecutorJob (ExecutorJob(id: 1)) on executor of remote distributed actor reference!")`
`87`	`87`	`// we do the bad idea of taking an executor from a remote worker`
`88`	`88`	`// and then force another actor to run on it; this will cause an enqueue on the "crash on enqueue" executor.`
`89`	`89`	`let wrongUse = EnqueueTest(unownedExecutor: normalRemoteWorker.unownedExecutor)`