Skip to content

Commit e68a522

Browse files
authored
Revert "Disable integration tests that fail because of rdar://134406349 (#90)"
This reverts commit 6c596f1.
1 parent a255bbd commit e68a522

File tree

3 files changed

+4
-17
lines changed

3 files changed

+4
-17
lines changed

IntegrationTests/Tests/SnippetDocumentationGenerationTests.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,6 @@ final class SnippetDocumentationGenerationTests: ConcurrencyRequiringTestCase {
4444
}
4545

4646
func testPreviewDocumentationWithSnippets() throws {
47-
#if os(macOS)
48-
throw XCTSkip("Skipping integration tests due to rdar://134406349")
49-
#else
5047
let outputDirectory = try temporaryDirectory().appendingPathComponent("output")
5148

5249
let port = try getAvailablePort()
@@ -105,6 +102,5 @@ final class SnippetDocumentationGenerationTests: ConcurrencyRequiringTestCase {
105102

106103
// Send an interrupt to the SwiftPM parent process
107104
process.interrupt()
108-
#endif
109105
}
110106
}

IntegrationTests/Tests/SwiftDocCPreviewTests.swift

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import XCTest
1111

1212
final class SwiftDocCPreview: ConcurrencyRequiringTestCase {
1313
func testRunPreviewServerOnSamePortRepeatedly() throws {
14-
#if os(macOS)
15-
throw XCTSkip("Skipping integration tests due to rdar://134406349")
16-
#else
1714
// Because only a single server can bind to a given port at a time,
1815
// this test ensures that the preview server running in the `docc`
1916
// process exits when the an interrupt is sent to the `SwiftPM` process.
@@ -113,6 +110,5 @@ final class SwiftDocCPreview: ConcurrencyRequiringTestCase {
113110
// Send an interrupt to the SwiftPM parent process
114111
process.interrupt()
115112
}
116-
#endif
117113
}
118114
}

IntegrationTests/Tests/Utility/XCTestCase+swiftPackage.swift

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -96,20 +96,15 @@ extension XCTestCase {
9696
}
9797

9898
return try processQueue.sync {
99-
let standardOutputString = String(data: standardOutputData, encoding: .utf8) ?? ""
100-
let standardErrorString = String(data: standardErrorData, encoding: .utf8) ?? ""
99+
let standardOutputString = String(data: standardOutputData, encoding: .utf8)
100+
let standardErrorString = String(data: standardErrorData, encoding: .utf8)
101101

102-
103-
if process.terminationStatus != 0, standardErrorString.contains("<unknown>:0: error: unknown argument: ") {
104-
throw XCTSkip("Skipping integration tests due to rdar://134406349")
105-
}
106-
107102
return SwiftInvocationResult(
108103
workingDirectory: directoryURL,
109104
swiftExecutable: try swiftExecutableURL,
110105
arguments: arguments.map(\.description),
111-
standardOutput: standardOutputString ,
112-
standardError: standardErrorString,
106+
standardOutput: standardOutputString ?? "",
107+
standardError: standardErrorString ?? "",
113108
exitStatus: Int(process.terminationStatus)
114109
)
115110
}

0 commit comments

Comments
 (0)