Skip to content

Commit a7ce830

Browse files
Merge pull request #3943 from SwiftPackageIndex/unpin-xctest-dynamic-overlay
Unpin xctest dynamic overlay
2 parents 40986d4 + b6d3709 commit a7ce830

File tree

5 files changed

+13
-9
lines changed

5 files changed

+13
-9
lines changed

Package.resolved

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ let package = Package(
4040
.package(url: "https://github.com/pointfreeco/swift-dependencies", from: "1.8.0"),
4141
.package(url: "https://github.com/pointfreeco/swift-parsing.git", from: "0.12.0"),
4242
.package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.11.1"),
43-
// sas 2026-01-12: xctest-dynamic-overlay 1.7.0+ are causing hangs on Linux when running tests locally, and fail in CI
44-
.package(url: "https://github.com/pointfreeco/xctest-dynamic-overlay.git", exact: "1.6.1"),
4543
.package(url: "https://github.com/scinfu/SwiftSoup.git", from: "2.3.2"),
4644
.package(url: "https://github.com/soto-project/soto.git", from: "6.0.0"),
4745
.package(url: "https://github.com/vapor-community/soto-cognito-authentication.git", from: "4.0.0"),

Sources/App/Core/Dependencies/MetricsSystemClient.swift

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,11 @@ extension MetricsSystemClient: DependencyKey {
4646

4747
extension MetricsSystemClient: TestDependencyKey {
4848
static var testValue: Self {
49-
.init(prometheus: { unimplemented("testValue"); return .init() })
49+
// 2026-01-28, sas: Normally, this should be
50+
// .init(prometheus: { unimplemented("testValue"); return .init() })
51+
// However, this is currently causing an issue on Linux.
52+
// https://github.com/SwiftPackageIndex/SwiftPackageIndex-Server/issues/3942
53+
.init(prometheus: { .init() })
5054
}
5155
}
5256

Tests/AppTests/QueryPerformanceTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ struct QueryPerformanceTests {
180180
JOIN versions v ON v.package_id = p.id
181181
WHERE v.reference ->> 'branch' = r.default_branch
182182
""")
183-
try await assertQueryPerformance(query, expectedCost: 200_000, variation: 5000)
183+
try await assertQueryPerformance(query, expectedCost: 210_000, variation: 5000)
184184
}
185185
}
186186

Tests/AppTests/ReAnalyzeVersionsTests.swift

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ extension AllTests.ReAnalyzeVersionsTests {
4242
"""
4343
}
4444
$0.httpClient.mastodonPost = { @Sendable _ in }
45+
$0.logger = .noop
4546
} operation: {
4647
try await withSPIApp { app in
4748
// setup
@@ -215,6 +216,7 @@ extension AllTests.ReAnalyzeVersionsTests {
215216
}
216217
return ""
217218
}
219+
$0.logger = .noop
218220
} operation: {
219221
try await withSPIApp { app in
220222
let pkg = try await savePackage(on: app.db,

0 commit comments

Comments
 (0)