Skip to content

Commit 6895d8e

Browse files
committed
Fix flaky tests
1 parent 89ec245 commit 6895d8e

File tree

3 files changed

+10
-26
lines changed

3 files changed

+10
-26
lines changed

Tests/AtomsTests/Atom/AsyncPhaseAtomTests.swift

+1-3
Original file line numberDiff line numberDiff line change
@@ -70,9 +70,7 @@ final class AsyncPhaseAtomTests: XCTestCase {
7070
await context.refresh(atom)
7171
}
7272

73-
Task {
74-
refreshTask.cancel()
75-
}
73+
refreshTask.cancel()
7674

7775
let phase = await refreshTask.value
7876
XCTAssertTrue(phase.isSuspending)

Tests/AtomsTests/Atom/TaskAtomTests.swift

+4-11
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,13 @@ final class TaskAtomTests: XCTestCase {
6666

6767
do {
6868
// Cancellation
69-
let refreshTask0 = Task {
69+
let refreshTask = Task {
7070
await context.refresh(atom)
7171
}
7272

73-
Task {
74-
refreshTask0.cancel()
75-
}
76-
77-
let task = await refreshTask0.value
73+
refreshTask.cancel()
7874

75+
let task = await refreshTask.value
7976
XCTAssertTrue(task.isCancelled)
8077
}
8178

@@ -89,19 +86,15 @@ final class TaskAtomTests: XCTestCase {
8986

9087
do {
9188
// Override cancellation
92-
9389
context.override(atom) { _ in Task { 400 } }
9490

9591
let refreshTask = Task {
9692
await context.refresh(atom)
9793
}
9894

99-
Task {
100-
refreshTask.cancel()
101-
}
95+
refreshTask.cancel()
10296

10397
let task = await refreshTask.value
104-
10598
XCTAssertTrue(task.isCancelled)
10699
}
107100
}

Tests/AtomsTests/Atom/ThrowingTaskAtomTests.swift

+5-12
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,9 @@ final class ThrowingTaskAtomTests: XCTestCase {
8585
await context.refresh(atom)
8686
}
8787

88-
Task {
89-
refreshTask.cancel()
90-
}
88+
refreshTask.cancel()
9189

9290
let task = await refreshTask.value
93-
9491
XCTAssertTrue(task.isCancelled)
9592
}
9693

@@ -104,20 +101,16 @@ final class ThrowingTaskAtomTests: XCTestCase {
104101

105102
do {
106103
// Override cancellation
107-
108104
context.override(atom) { _ in Task { 400 } }
109105

110-
let refreshTask1 = Task {
106+
let refreshTask = Task {
111107
await context.refresh(atom)
112108
}
113109

114-
Task {
115-
refreshTask1.cancel()
116-
}
117-
118-
let task1 = await refreshTask1.value
110+
refreshTask.cancel()
119111

120-
XCTAssertTrue(task1.isCancelled)
112+
let task = await refreshTask.value
113+
XCTAssertTrue(task.isCancelled)
121114
}
122115
}
123116

0 commit comments

Comments
 (0)