Skip to content

Commit 184d5aa

Browse files
committed
CI: raise timeouts
1 parent 6c48e49 commit 184d5aa

File tree

3 files changed

+14
-28
lines changed

3 files changed

+14
-28
lines changed

.github/workflows/CI.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
macOS:
2525
name: macOS
2626
runs-on: ${{ matrix.runsOn }}
27-
timeout-minutes: 40
27+
timeout-minutes: 60
2828
strategy:
2929
fail-fast: false
3030
matrix:
@@ -60,7 +60,7 @@ jobs:
6060
iOS:
6161
name: iOS
6262
runs-on: ${{ matrix.runsOn }}
63-
timeout-minutes: 40
63+
timeout-minutes: 60
6464
strategy:
6565
fail-fast: false
6666
matrix:
@@ -80,7 +80,7 @@ jobs:
8080
SPM:
8181
name: SPM
8282
runs-on: ${{ matrix.runsOn }}
83-
timeout-minutes: 40
83+
timeout-minutes: 60
8484
strategy:
8585
fail-fast: false
8686
matrix:
@@ -132,7 +132,7 @@ jobs:
132132
CustomSQLite:
133133
name: CustomSQLite
134134
runs-on: ${{ matrix.runsOn }}
135-
timeout-minutes: 40
135+
timeout-minutes: 60
136136
strategy:
137137
fail-fast: false
138138
matrix:
@@ -152,7 +152,7 @@ jobs:
152152
XCFramework:
153153
name: XCFramework
154154
runs-on: ${{ matrix.runsOn }}
155-
timeout-minutes: 40
155+
timeout-minutes: 60
156156
strategy:
157157
fail-fast: false
158158
matrix:

Tests/GRDBTests/ValueObservationQueryInterfaceRequestTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
8080

8181
let recorder = observation.record(in: dbQueue)
8282
try dbQueue.writeWithoutTransaction(performDatabaseModifications)
83-
let results = try wait(for: recorder.next(6), timeout: 1)
83+
let results = try wait(for: recorder.next(6), timeout: 5)
8484

8585
XCTAssertNil(results[0])
8686

@@ -117,7 +117,7 @@ class ValueObservationQueryInterfaceRequestTests: GRDBTestCase {
117117

118118
let recorder = observation.record(in: dbQueue)
119119
try dbQueue.writeWithoutTransaction(performDatabaseModifications)
120-
let results = try wait(for: recorder.next(6), timeout: 1)
120+
let results = try wait(for: recorder.next(6), timeout: 5)
121121

122122
XCTAssertEqual(results[0].count, 0)
123123

Tests/GRDBTests/ValueObservationRecorder.swift

Lines changed: 7 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -422,13 +422,6 @@ extension GRDBTestCase {
422422
throws
423423
where Reducer.Value: Equatable
424424
{
425-
#if SQLITE_HAS_CODEC || GRDBCUSTOMSQLITE
426-
// debug SQLite builds can be *very* slow
427-
let timeout: TimeInterval = 4
428-
#else
429-
let timeout: TimeInterval = 1
430-
#endif
431-
432425
func test(
433426
observation: ValueObservation<Reducer>,
434427
scheduling scheduler: ValueObservationScheduler,
@@ -455,7 +448,7 @@ extension GRDBTestCase {
455448
try writer.writeWithoutTransaction(recordedUpdates)
456449

457450
let expectation = recorder.next(expectedValues.count)
458-
let values = try wait(for: expectation, timeout: timeout)
451+
let values = try wait(for: expectation, timeout: 5)
459452
XCTAssertEqual(
460453
values, expectedValues,
461454
"\(#function), \(writer), \(scheduler)", file: file, line: line)
@@ -485,7 +478,7 @@ extension GRDBTestCase {
485478
}
486479

487480
let expectation = recorder.next(expectedValues.count)
488-
let values = try wait(for: expectation, timeout: timeout)
481+
let values = try wait(for: expectation, timeout: 5)
489482
XCTAssertEqual(
490483
values, expectedValues,
491484
"\(#function), \(writer), \(scheduler)", file: file, line: line)
@@ -516,14 +509,14 @@ extension GRDBTestCase {
516509
if waitForLast {
517510
// Optimization!
518511
let expectation = recorder.prefix(until: { $0 == lastExpectedValue } )
519-
recordedValues = try wait(for: expectation, timeout: timeout)
512+
recordedValues = try wait(for: expectation, timeout: 5)
520513
} else {
521514
// Slow!
522515
assertionFailure("Please rewrite your test, because it is too slow: make sure the last expected value is unique.")
523516
let expectation = recorder
524517
.prefix(expectedValues.count + 2 /* pool may perform double initial fetch */)
525518
.inverted
526-
recordedValues = try wait(for: expectation, timeout: timeout)
519+
recordedValues = try wait(for: expectation, timeout: 5)
527520
}
528521

529522
if scheduler.immediateInitialValue() {
@@ -565,14 +558,14 @@ extension GRDBTestCase {
565558
if waitForLast {
566559
// Optimization!
567560
let expectation = recorder.prefix(until: { $0 == lastExpectedValue } )
568-
recordedValues = try wait(for: expectation, timeout: timeout)
561+
recordedValues = try wait(for: expectation, timeout: 5)
569562
} else {
570563
// Slow!
571564
assertionFailure("Please rewrite your test, because it is too slow: make sure the last expected value is unique.")
572565
let expectation = recorder
573566
.prefix(expectedValues.count + 2 /* pool may perform double initial fetch */)
574567
.inverted
575-
recordedValues = try wait(for: expectation, timeout: timeout)
568+
recordedValues = try wait(for: expectation, timeout: 5)
576569
}
577570

578571
XCTAssertEqual(recordedValues.first, expectedValues.first)
@@ -639,13 +632,6 @@ extension GRDBTestCase {
639632
line: UInt)
640633
throws
641634
{
642-
#if SQLITE_HAS_CODEC || GRDBCUSTOMSQLITE
643-
// debug SQLite builds can be *very* slow
644-
let timeout: TimeInterval = 2
645-
#else
646-
let timeout: TimeInterval = 1
647-
#endif
648-
649635
func test(
650636
observation: ValueObservation<Reducer>,
651637
scheduling scheduler: ValueObservationScheduler,
@@ -659,7 +645,7 @@ extension GRDBTestCase {
659645
scheduling: scheduler,
660646
onError: { _ in testErrorDispatching() })
661647

662-
let (_, error) = try wait(for: recorder.failure(), timeout: timeout)
648+
let (_, error) = try wait(for: recorder.failure(), timeout: 5)
663649
if let error = error as? Failure {
664650
try testFailure(error, writer)
665651
} else {

0 commit comments

Comments
 (0)