Skip to content

Commit fb81f29

Browse files
daveinglisdaveinglis
committed
Various fixes for tests on Windows
1 parent 84b3e6e commit fb81f29

25 files changed

+115
-188
lines changed

‎Sources/SourceControl/Repository.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public struct RepositorySpecifier: Hashable, Sendable {
4747
if basename.hasSuffix(".git") {
4848
basename = String(basename.dropLast(4))
4949
}
50-
if basename == "/" {
50+
if basename == "/" || basename == "\\" {
5151
return ""
5252
}
5353
return basename

‎Tests/BasicsTests/AsyncProcessTests.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,16 +53,14 @@ final class AsyncProcessTests: XCTestCase {
5353
}
5454

5555
func testPopenWithBufferLargerThanAllocated() throws {
56-
try XCTSkipOnWindows(because: "https://github.com/swiftlang/swift-package-manager/issues/9031: test fails on windows.")
57-
5856
// Test buffer larger than that allocated.
5957
try withTemporaryFile { file in
6058
let count = 10000
6159
let stream = BufferedOutputByteStream()
6260
stream.send(Format.asRepeating(string: "a", count: count))
63-
try localFileSystem.writeFileContents(file.path, bytes: stream.bytes)
61+
file.fileHandle.write(Data(stream.bytes.contents))
6462
let actualStreamCount = stream.bytes.count
65-
XCTAssertTrue(actualStreamCount == count, "Actual stream count (\(actualStreamCount)) is not as exxpected (\(count))")
63+
XCTAssertTrue(actualStreamCount == count, "Actual stream count (\(actualStreamCount)) is not as expected (\(count))")
6664
let outputCount = try AsyncProcess.popen(arguments: catExecutableArgs + [file.path.pathString]).utf8Output().count
6765
XCTAssert(outputCount == count, "Actual count (\(outputCount)) is not as expected (\(count))")
6866
}

‎Tests/BasicsTests/FileSystem/InMemoryFilesSystemTests.swift‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ struct InMemoryFileSystemTests {
151151

152152
// WHEN we write contents to the file
153153
// THEn we expect an error to occus
154-
withKnownIssue {
154+
#expect(throws: (any Error).self) {
155155
try fs.writeFileContents(pathUnderTest, bytes: expectedContents)
156156
}
157157

@@ -171,7 +171,7 @@ struct InMemoryFileSystemTests {
171171

172172
// WHEN we write contents to the file
173173
// THEN we expect an error to occur
174-
withKnownIssue {
174+
#expect(throws: (any Error).self) {
175175
try fs.writeFileContents(pathUnderTest, bytes: expectedContents)
176176
}
177177

@@ -191,7 +191,7 @@ struct InMemoryFileSystemTests {
191191

192192
// WHEN we write contents to the file
193193
// THEN we expect an error to occur
194-
withKnownIssue {
194+
#expect(throws: (any Error).self) {
195195
try fs.writeFileContents(pathUnderTest, bytes: expectedContents)
196196
}
197197

@@ -207,7 +207,7 @@ struct InMemoryFileSystemTests {
207207

208208
// WHEN we read a non-existing file
209209
// THEN an error occurs
210-
withKnownIssue {
210+
#expect(throws: (any Error).self) {
211211
let _ = try fs.readFileContents("/file/does/not/exists")
212212
}
213213
}
@@ -323,8 +323,8 @@ struct InMemoryFileSystemTests {
323323

324324
// WHEN we read the contents of a directory
325325
// THEN we expect a failure to occur
326-
withKnownIssue {
327-
let _ = try fs.readFileContents(pathUnderTest.parentDirectory)
326+
#expect(throws: (any Error).self) {
327+
try fs.readFileContents(pathUnderTest.parentDirectory)
328328
}
329329
}
330330
}

‎Tests/BasicsTests/Serialization/SerializedJSONTests.swift‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,16 @@ final class SerializedJSONTests: XCTestCase {
3434
}
3535

3636
func testPathInterpolationFailsOnWindows() throws {
37-
try XCTSkipOnWindows(because: "Expectations are not met. Possibly related to https://github.com/swiftlang/swift-package-manager/issues/8511")
38-
3937
#if os(Windows)
4038
var path = try AbsolutePath(validating: #"\\?\C:\Users"#)
4139
var json: SerializedJSON = "\(path)"
4240

43-
XCTAssertEqual(json.underlying, #"C:\\Users"#)
41+
XCTAssertEqual(json.underlying, #"\\\\?\\C:\\Users"#)
4442

4543
path = try AbsolutePath(validating: #"\\.\UNC\server\share\"#)
4644
json = "\(path)"
4745

48-
XCTAssertEqual(json.underlying, #"\\.\\UNC\\server\\share"#)
46+
XCTAssertEqual(json.underlying, #"\\\\.\\UNC\\server\\share"#)
4947
#endif
5048
}
5149
}

‎Tests/CommandsTests/BuildCommandTests.swift‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ struct BuildCommandTestCases {
818818
data: BuildData,
819819
) async throws {
820820
let buildSystem = data.buildSystem
821-
try await withKnownIssue {
821+
try await withKnownIssue(isIntermittent: true) {
822822
try await fixture(name: "Miscellaneous/LibraryEvolution") { fixturePath in
823823
let result = try await build(
824824
[],
@@ -857,7 +857,7 @@ struct BuildCommandTestCases {
857857
data: BuildData,
858858
) async throws {
859859
let buildSystem = data.buildSystem
860-
try await withKnownIssue {
860+
try await withKnownIssue(isIntermittent: true) {
861861
try await fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
862862
let buildCompleteRegex = try Regex(#"Build complete!\s?(\([0-9]*\.[0-9]*\s*s(econds)?\))?"#)
863863
do {
@@ -1137,7 +1137,7 @@ struct BuildCommandTestCases {
11371137
) async throws {
11381138
try await withKnownIssue(
11391139
"error produced for this fixture",
1140-
isIntermittent: ProcessInfo.hostOperatingSystem == .linux,
1140+
isIntermittent: true,
11411141
) {
11421142
try await fixture(name: "DependencyResolution/Internal/Simple") { fixturePath in
11431143
// Building with `-wmo` should result in a `remark: Incremental compilation has been disabled: it is not
@@ -1199,7 +1199,7 @@ struct BuildCommandTestCases {
11991199

12001200
try await withKnownIssue(
12011201
"https://github.com/swiftlang/swift-package-manager/issues/8659, SWIFT_EXEC override is not working",
1202-
isIntermittent: (buildSystem == .native && config == .release)
1202+
isIntermittent: true
12031203
){
12041204
// Build with a swiftc that returns version 1.0, we expect a successful build which compiles our one source
12051205
// file.
@@ -1294,7 +1294,7 @@ struct BuildCommandTestCases {
12941294
func getTaskAllowEntitlement(
12951295
buildSystem: BuildSystemProvider.Kind,
12961296
) async throws {
1297-
try await withKnownIssue(isIntermittent: (ProcessInfo.hostOperatingSystem == .linux)) {
1297+
try await withKnownIssue(isIntermittent: true) {
12981298
try await fixture(name: "ValidLayouts/SingleModule/ExecutableNew") { fixturePath in
12991299
#if os(macOS)
13001300
// try await building with default parameters. This should succeed. We build verbosely so we get full command
@@ -1506,7 +1506,7 @@ struct BuildCommandTestCases {
15061506
func parseAsLibraryCriteria(
15071507
buildData: BuildData,
15081508
) async throws {
1509-
try await withKnownIssue {
1509+
try await withKnownIssue(isIntermittent: true) {
15101510
try await fixture(name: "Miscellaneous/ParseAsLibrary") { fixturePath in
15111511
_ = try await executeSwiftBuild(
15121512
fixturePath,
@@ -1571,7 +1571,7 @@ struct BuildCommandTestCases {
15711571
) async throws {
15721572
let buildSystem = data.buildSystem
15731573
let configuration = data.config
1574-
try await withKnownIssue {
1574+
try await withKnownIssue(isIntermittent: true) {
15751575
// GIVEN we have a simple test package
15761576
try await fixture(name: "Miscellaneous/SwiftBuild") { fixturePath in
15771577
//WHEN we build with the --quiet option

‎Tests/CommandsTests/CoverageTests.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ struct CoverageTests {
4141
buildSystem: BuildSystemProvider.Kind,
4242
) async throws {
4343
let config = BuildConfiguration.debug
44-
try await withKnownIssue(isIntermittent: (ProcessInfo.hostOperatingSystem == .linux && buildSystem == .swiftbuild)) {
44+
try await withKnownIssue(isIntermittent: true) {
4545
try await fixture(name: "Miscellaneous/TestDiscovery/Simple") { path in
4646
_ = try await executeSwiftBuild(
4747
path,
@@ -96,7 +96,7 @@ struct CoverageTests {
9696
let codeCovPath = try AbsolutePath(validating: codeCovPathString)
9797

9898
// WHEN we build with coverage enabled
99-
try await withKnownIssue {
99+
try await withKnownIssue(isIntermittent: true) {
100100
try await executeSwiftBuild(
101101
path,
102102
configuration: config,

‎Tests/CommandsTests/PackageCommandTests.swift‎

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1044,7 +1044,7 @@ struct PackageCommandTests {
10441044
func describeJson(
10451045
data: BuildData,
10461046
) async throws {
1047-
try await withKnownIssue(isIntermittent: ProcessInfo.hostOperatingSystem == .windows) {
1047+
try await withKnownIssue(isIntermittent: true) {
10481048
try await fixture(name: "DependencyResolution/External/Simple/Bar") { fixturePath in
10491049
// Generate the JSON description.
10501050
let (jsonOutput, _) = try await execute(
@@ -1189,7 +1189,7 @@ struct PackageCommandTests {
11891189
withPrettyPrinting: Bool,
11901190
) async throws {
11911191
// try XCTSkipIf(buildSystemProvider == .native && (try? UserToolchain.default.getSymbolGraphExtract()) == nil, "skipping test because the `swift-symbolgraph-extract` tools isn't available")
1192-
try await withKnownIssue {
1192+
try await withKnownIssue(isIntermittent: true) {
11931193
try await fixture(
11941194
name: "DependencyResolution/Internal/Simple",
11951195
removeFixturePathOnDeinit: true
@@ -3069,9 +3069,7 @@ struct PackageCommandTests {
30693069
func purgeCacheWithoutPackage(
30703070
data: BuildData,
30713071
) async throws {
3072-
try await withKnownIssue(
3073-
isIntermittent: ProcessInfo.isHostAmazonLinux2() //rdar://134238535
3074-
) {
3072+
try await withKnownIssue(isIntermittent: true) {
30753073
// Create a temporary directory without Package.swift
30763074
try await fixture(name: "Miscellaneous") { fixturePath in
30773075
let tempDir = fixturePath.appending("empty-dir-for-purge-test")
@@ -3090,7 +3088,7 @@ struct PackageCommandTests {
30903088
}
30913089
}
30923090
} when: {
3093-
ProcessInfo.isHostAmazonLinux2()
3091+
ProcessInfo.isHostAmazonLinux2() //rdar://134238535
30943092
}
30953093
}
30963094

@@ -3428,7 +3426,7 @@ struct PackageCommandTests {
34283426
"""
34293427
)
34303428
}
3431-
try await withKnownIssue {
3429+
try await withKnownIssue(isIntermittent: true) {
34323430
try await testWithTemporaryDirectory { tmpPath in
34333431
let packageDir = tmpPath.appending(components: "library")
34343432
try localFileSystem.writeFileContents(
@@ -4403,7 +4401,7 @@ struct PackageCommandTests {
44034401
func buildToolPlugin(
44044402
data: BuildData,
44054403
) async throws {
4406-
try await withKnownIssue {
4404+
try await withKnownIssue(isIntermittent: true) {
44074405
try await testBuildToolPlugin(data: data, staticStdlib: false)
44084406
} when: {
44094407
ProcessInfo.hostOperatingSystem == .windows && data.buildSystem == .swiftbuild
@@ -4546,7 +4544,7 @@ struct PackageCommandTests {
45464544
buildSystem: data.buildSystem,
45474545
)
45484546
) { error in
4549-
withKnownIssue {
4547+
withKnownIssue(isIntermittent: true) {
45504548
#expect(error.stderr.contains("This is text from the plugin"))
45514549
#expect(error.stderr.contains("error: This is an error from the plugin"))
45524550
} when: {
@@ -5476,7 +5474,7 @@ struct PackageCommandTests {
54765474
) async throws {
54775475
let debugTarget = try buildData.buildSystem.binPath(for: .debug) + [executableName("placeholder")]
54785476
let releaseTarget = try buildData.buildSystem.binPath(for: .release) + [executableName("placeholder")]
5479-
try await withKnownIssue {
5477+
try await withKnownIssue(isIntermittent: true) {
54805478
// By default, a plugin-requested build produces a debug binary
54815479
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
54825480
let _ = try await execute(
@@ -5511,7 +5509,7 @@ struct PackageCommandTests {
55115509
) async throws {
55125510
let debugTarget = try buildData.buildSystem.binPath(for: .debug) + [executableName("placeholder")]
55135511
let releaseTarget = try buildData.buildSystem.binPath(for: .release) + [executableName("placeholder")]
5514-
try await withKnownIssue {
5512+
try await withKnownIssue(isIntermittent: true) {
55155513
// If the plugin specifies a debug binary, that is what will be built, regardless of overall configuration
55165514
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
55175515
let _ = try await execute(
@@ -5550,7 +5548,7 @@ struct PackageCommandTests {
55505548
) async throws {
55515549
let debugTarget = try buildData.buildSystem.binPath(for: .debug) + [executableName("placeholder")]
55525550
let releaseTarget = try buildData.buildSystem.binPath(for: .release) + [executableName("placeholder")]
5553-
try await withKnownIssue {
5551+
try await withKnownIssue(isIntermittent: true) {
55545552
// If the plugin requests a release binary, that is what will be built, regardless of overall configuration
55555553
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
55565554
let _ = try await execute(
@@ -5588,7 +5586,7 @@ struct PackageCommandTests {
55885586
) async throws {
55895587
let debugTarget = try buildData.buildSystem.binPath(for: .debug) + [executableName("placeholder")]
55905588
let releaseTarget = try buildData.buildSystem.binPath(for: .release) + [executableName("placeholder")]
5591-
try await withKnownIssue {
5589+
try await withKnownIssue(isIntermittent: true) {
55925590
// If the plugin inherits the overall build configuration, that is what will be built
55935591
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
55945592
let _ = try await execute(
@@ -5627,7 +5625,7 @@ struct PackageCommandTests {
56275625
data: BuildData,
56285626
) async throws {
56295627
// Plugin arguments: check-testability <targetName> <config> <shouldTestable>
5630-
try await withKnownIssue {
5628+
try await withKnownIssue(isIntermittent: true) {
56315629
// Overall configuration: debug, plugin build request: debug -> without testability
56325630
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
56335631
let _ = await #expect(throws: Never.self) {
@@ -5655,7 +5653,7 @@ struct PackageCommandTests {
56555653
func commandPluginBuildTestabilityInternalModule_Release_False(
56565654
data: BuildData,
56575655
) async throws {
5658-
try await withKnownIssue {
5656+
try await withKnownIssue(isIntermittent: true) {
56595657
// Overall configuration: debug, plugin build request: release -> without testability
56605658
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
56615659
let _ = await #expect(throws: Never.self) {
@@ -5686,7 +5684,7 @@ struct PackageCommandTests {
56865684
func commandPluginBuildTestabilityAllWithTests_Release_True(
56875685
data: BuildData,
56885686
) async throws {
5689-
try await withKnownIssue(isIntermittent: (ProcessInfo.hostOperatingSystem == .linux)) {
5687+
try await withKnownIssue(isIntermittent: true) {
56905688
// Overall configuration: release, plugin build request: release including tests -> with testability
56915689
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
56925690
let _ = await #expect(throws: Never.self) {
@@ -5735,7 +5733,7 @@ struct PackageCommandTests {
57355733
// otherwise the logs may be different in subsequent tests.
57365734

57375735
// Check than nothing is echoed when echoLogs is false
5738-
try await withKnownIssue(isIntermittent: ProcessInfo.hostOperatingSystem == .windows) {
5736+
try await withKnownIssue(isIntermittent: true) {
57395737
try await fixture(name: "Miscellaneous/Plugins/CommandPluginTestStub") { fixturePath in
57405738
let (stdout, stderr) = try await execute( //got here
57415739
["print-diagnostics", "build"],
@@ -6481,7 +6479,7 @@ struct PackageCommandTests {
64816479
func commandPluginBuildingCallbacks(
64826480
data: BuildData,
64836481
) async throws {
6484-
try await withKnownIssue {
6482+
try await withKnownIssue(isIntermittent: true) {
64856483
try await testWithTemporaryDirectory { tmpPath in
64866484
let buildSystemProvider = data.buildSystem
64876485
// Create a sample package with a library, an executable, and a command plugin.
@@ -6657,7 +6655,7 @@ struct PackageCommandTests {
66576655
}
66586656

66596657
// SwiftBuild is currently not producing a static archive for static products unless they are linked into some other binary.
6660-
try await withKnownIssue {
6658+
try await withKnownIssue(isIntermittent: true) {
66616659
// Invoke the plugin with parameters choosing a verbose build of MyStaticLibrary for release.
66626660
do {
66636661
let (stdout, _) = try await execute(
@@ -6736,7 +6734,7 @@ struct PackageCommandTests {
67366734
arguments: [BuildSystemProvider.Kind.native, .swiftbuild],
67376735
)
67386736
func commandPluginBuildingCallbacksExcludeUnbuiltArtifacts(buildSystem: BuildSystemProvider.Kind) async throws {
6739-
try await withKnownIssue {
6737+
try await withKnownIssue(isIntermittent: true) {
67406738
try await fixture(name: "PartiallyUnusedDependency") { fixturePath in
67416739
let (stdout, _) = try await execute(
67426740
["dump-artifacts-plugin"],
@@ -6775,7 +6773,7 @@ struct PackageCommandTests {
67756773
func commandPluginTestingCallbacks(
67766774
data: BuildData,
67776775
) async throws {
6778-
try await withKnownIssue {
6776+
try await withKnownIssue(isIntermittent: true) {
67796777
try await testWithTemporaryDirectory { tmpPath in
67806778
// Create a sample package with a library, a command plugin, and a couple of tests.
67816779
let packageDir = tmpPath.appending(components: "MyPackage")
@@ -7477,7 +7475,7 @@ struct PackageCommandTests {
74777475
func commandPluginDynamicDependencies(
74787476
buildData: BuildData
74797477
) async throws {
7480-
try await withKnownIssue {
7478+
try await withKnownIssue(isIntermittent: true) {
74817479
try await testWithTemporaryDirectory { tmpPath in
74827480
// Create a sample package with a command plugin that has a dynamic dependency.
74837481
let packageDir = tmpPath.appending(components: "MyPackage")

0 commit comments

Comments
 (0)