Skip to content

Commit e6ee37a

Browse files
authored
Merge pull request #64891 from ktoso/pick-adjust-test-compilation
🍒[5.9] Fix test using assume APIs, which landed concurrently to API renames
2 parents ecfc98d + dccef22 commit e6ee37a

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

test/Concurrency/Runtime/actor_assume_executor.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,19 +103,19 @@ final class MainActorEcho {
103103
if #available(SwiftStdlib 5.9, *) {
104104
// === MainActor --------------------------------------------------------
105105

106-
tests.test("assumeOnMainActorExecutor: assume the main executor, from 'main() async'") {
106+
tests.test("MainActor.assumeIsolated: assume the main executor, from 'main() async'") {
107107
await checkAssumeMainActor(echo: echo)
108108
}
109109

110-
tests.test("assumeOnMainActorExecutor: assume the main executor, from MainActor method") {
110+
tests.test("MainActor.assumeIsolated: assume the main executor, from MainActor method") {
111111
await mainActorCallCheck(echo: echo)
112112
}
113113

114-
tests.test("assumeOnMainActorExecutor: assume the main executor, from actor on MainActor executor") {
114+
tests.test("MainActor.assumeIsolated: assume the main executor, from actor on MainActor executor") {
115115
await MainFriend().callCheck(echo: echo)
116116
}
117117

118-
tests.test("assumeOnMainActorExecutor: wrongly assume the main executor, from actor on other executor") {
118+
tests.test("MainActor.assumeIsolated: wrongly assume the main executor, from actor on other executor") {
119119
expectCrashLater(withMessage: "Incorrect actor executor assumption; Expected 'MainActor' executor.")
120120
await Someone().callCheckMainActor(echo: echo)
121121
}

test/Distributed/Runtime/distributed_actor_custom_executor_availability.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ distributed actor FiveSevenActor_NothingExecutor {
3333
defer {
3434
print("done executed: \(#function)")
3535
}
36-
assumeOnMainActorExecutor {
36+
MainActor.assumeIsolated {
3737
// ignore
3838
}
3939
}
@@ -52,7 +52,7 @@ distributed actor FiveNineActor_NothingExecutor {
5252
defer {
5353
print("done executed: \(#function)")
5454
}
55-
assumeOnMainActorExecutor {
55+
MainActor.assumeIsolated {
5656
// ignore
5757
}
5858
}
@@ -71,7 +71,7 @@ distributed actor FiveSevenActor_FiveNineExecutor {
7171
defer {
7272
print("done executed: \(#function)")
7373
}
74-
assumeOnMainActorExecutor {
74+
MainActor.assumeIsolated {
7575
// ignore
7676
}
7777
}

0 commit comments

Comments
 (0)