Fix up cancellable job test

thoven87 · thoven87 · commit a4d35d4e7694 · 2025-03-13T11:26:53.000-04:00
diff --git a/Sources/JobsPostgres/PostgresJobsQueue.swift b/Sources/JobsPostgres/PostgresJobsQueue.swift
@@ -200,9 +200,9 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma
             try await deleteFromQueue(jobID: jobID, connection: connection)
             if configuration.deleteCancelledJobs {
                 try await delete(jobID: jobID)
-                return
+            } else {
+                try await setStatus(jobID: jobID, status: .cancelled, connection: connection)
             }
-            try await setStatus(jobID: jobID, status: .cancelled, connection: connection)
         }
     }
 
diff --git a/Tests/JobsPostgresTests/JobsTests.swift b/Tests/JobsPostgresTests/JobsTests.swift
@@ -794,9 +794,9 @@ final class JobsTests: XCTestCase {
                 }
 
                 await fulfillment(of: [expectation], timeout: 10)
-
+                // Job has been removed
                 let cancelledJobs = try await jobQueue.queue.getJobs(withStatus: .cancelled)
-                XCTAssertEqual(cancelledJobs.count, 1)
+                XCTAssertEqual(cancelledJobs.count, 0)
 
                 await serviceGroup.triggerGracefulShutdown()
 

Original file line number	Diff line number	Diff line change
`@@ -200,9 +200,9 @@ public final class PostgresJobQueue: JobQueueDriver, CancellableJobQueue, Resuma`
`200`	`200`	`try await deleteFromQueue(jobID: jobID, connection: connection)`
`201`	`201`	`if configuration.deleteCancelledJobs {`
`202`	`202`	`try await delete(jobID: jobID)`
`203`		`- return`
	`203`	`+ } else {`
	`204`	`+ try await setStatus(jobID: jobID, status: .cancelled, connection: connection)`
`204`	`205`	`}`
`205`		`- try await setStatus(jobID: jobID, status: .cancelled, connection: connection)`
`206`	`206`	`}`
`207`	`207`	`}`
`208`	`208`
Original file line number	Diff line number	Diff line change
`@@ -794,9 +794,9 @@ final class JobsTests: XCTestCase {`
`794`	`794`	`}`
`795`	`795`
`796`	`796`	`await fulfillment(of: [expectation], timeout: 10)`
`797`		`-`
	`797`	`+ // Job has been removed`
`798`	`798`	`let cancelledJobs = try await jobQueue.queue.getJobs(withStatus: .cancelled)`
`799`		`- XCTAssertEqual(cancelledJobs.count, 1)`
	`799`	`+ XCTAssertEqual(cancelledJobs.count, 0)`
`800`	`800`
`801`	`801`	`await serviceGroup.triggerGracefulShutdown()`
`802`	`802`