Skip to content

Deflake queue-deallocation tests by awaiting the enqueued task #78

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
dfed wants to merge 1 commit into
base: main
Choose a base branch
from
+12 −16
Open

Deflake queue-deallocation tests by awaiting the enqueued task #78

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 12 additions & 16 deletions Tests/AsyncQueueTests/FIFOQueueTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,17 +265,15 @@ struct FIFOQueueTests {
func task_executesAfterQueueIsDeallocated() async throws {
var systemUnderTest: FIFOQueue? = FIFOQueue()
let counter = Counter()
let expectation = Expectation()
let semaphore = Semaphore()
try Task(on: #require(systemUnderTest)) {
// Make the queue wait.
await semaphore.wait()
await counter.incrementAndExpectCount(equals: 1)
}
try Task(on: #require(systemUnderTest)) {
let lastTask = try Task(on: #require(systemUnderTest)) {
// This async task should not execute until the semaphore is released.
await counter.incrementAndExpectCount(equals: 2)
expectation.fulfill()
}
weak var queue = systemUnderTest
// Nil out our reference to the queue to show that the enqueued tasks will still complete
Expand All @@ -284,24 +282,23 @@ struct FIFOQueueTests {
// Signal the semaphore to unlock the remaining enqueued tasks.
await semaphore.signal()

await expectation.fulfillment(withinSeconds: 30)
// Await the last enqueued task to deterministically confirm the enqueued work ran after the queue was deallocated.
await lastTask.value
}

@Test
func taskIsolatedTo_executesAfterQueueIsDeallocated() async throws {
var systemUnderTest: FIFOQueue? = FIFOQueue()
let counter = Counter()
let expectation = Expectation()
let semaphore = Semaphore()
try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
// Make the queue wait.
await semaphore.wait()
counter.incrementAndExpectCount(equals: 1)
}
try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
let lastTask = try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
// This async task should not execute until the semaphore is released.
counter.incrementAndExpectCount(equals: 2)
expectation.fulfill()
}
weak var queue = systemUnderTest
// Nil out our reference to the queue to show that the enqueued tasks will still complete
Expand All @@ -310,25 +307,24 @@ struct FIFOQueueTests {
// Signal the semaphore to unlock the remaining enqueued tasks.
await semaphore.signal()

await expectation.fulfillment(withinSeconds: 30)
// Await the last enqueued task to deterministically confirm the enqueued work ran after the queue was deallocated.
await lastTask.value
}

@Test
func throwingTask_executesAfterQueueIsDeallocated() async throws {
var systemUnderTest: FIFOQueue? = FIFOQueue()
let counter = Counter()
let expectation = Expectation()
let semaphore = Semaphore()
try Task(on: #require(systemUnderTest)) {
// Make the queue wait.
await semaphore.wait()
await counter.incrementAndExpectCount(equals: 1)
try doWork()
}
try Task(on: #require(systemUnderTest)) {
let lastTask = try Task(on: #require(systemUnderTest)) {
// This async task should not execute until the semaphore is released.
await counter.incrementAndExpectCount(equals: 2)
expectation.fulfill()
try doWork()
}
weak var queue = systemUnderTest
Expand All @@ -338,25 +334,24 @@ struct FIFOQueueTests {
// Signal the semaphore to unlock the remaining enqueued tasks.
await semaphore.signal()

await expectation.fulfillment(withinSeconds: 30)
// Await the last enqueued task to deterministically confirm the enqueued work ran after the queue was deallocated.
try await lastTask.value
}

@Test
func throwingTaskIsolatedTo_executesAfterQueueIsDeallocated() async throws {
var systemUnderTest: FIFOQueue? = FIFOQueue()
let counter = Counter()
let expectation = Expectation()
let semaphore = Semaphore()
try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
// Make the queue wait.
await semaphore.wait()
counter.incrementAndExpectCount(equals: 1)
try doWork()
}
try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
let lastTask = try Task(on: #require(systemUnderTest), isolatedTo: counter) { counter in
// This async task should not execute until the semaphore is released.
counter.incrementAndExpectCount(equals: 2)
expectation.fulfill()
try doWork()
}
weak var queue = systemUnderTest
Expand All @@ -366,7 +361,8 @@ struct FIFOQueueTests {
// Signal the semaphore to unlock the remaining enqueued tasks.
await semaphore.signal()

await expectation.fulfillment(withinSeconds: 30)
// Await the last enqueued task to deterministically confirm the enqueued work ran after the queue was deallocated.
try await lastTask.value
}

@Test
Expand Down
Loading