Tests: special case deserialisation on Windows #6980
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
compnerd
requested review from
neonichu,
tomerd and
MaxDesiatov
as code owners
|
@swift-ci please test |
MaxDesiatov
requested changes
Oct 8, 2023
Comment on lines
4853
to
4856
| let inputs: SerializedJSON = """ | ||
| inputs: ["\(AbsolutePath("/Pkg/Snippets/ASnippet.swift"))","\(swiftGetVersionFilePath.escapedPathString)","\(AbsolutePath("/Pkg/.build/debug/Lib.swiftmodule"))" | ||
| inputs: ["\(AbsolutePath("/Pkg/Snippets/ASnippet.swift")._nativePathString(escaped: false))","\(swiftGetVersionFilePath.escapedPathString)","\(AbsolutePath("/Pkg/.build/debug/Lib.swiftmodule")._nativePathString(escaped: false))" | ||
| """ | ||
| XCTAssertMatch(yamlContents, .contains(inputs.underlying)) |
There was a problem hiding this comment.
If inputs type is changed to plain String, that will use string interpolation of AbsolutePath that calls _nativePathString(escaped: false) automatically.
Suggested change
| let inputs: SerializedJSON = """ | |
| inputs: ["\(AbsolutePath("/Pkg/Snippets/ASnippet.swift"))","\(swiftGetVersionFilePath.escapedPathString)","\(AbsolutePath("/Pkg/.build/debug/Lib.swiftmodule"))" | |
| inputs: ["\(AbsolutePath("/Pkg/Snippets/ASnippet.swift")._nativePathString(escaped: false))","\(swiftGetVersionFilePath.escapedPathString)","\(AbsolutePath("/Pkg/.build/debug/Lib.swiftmodule")._nativePathString(escaped: false))" | |
| """ | |
| XCTAssertMatch(yamlContents, .contains(inputs.underlying)) | |
| let inputs = """ | |
| inputs: ["\(AbsolutePath("/Pkg/Snippets/ASnippet.swift"))","\(swiftGetVersionFilePath.escapedPathString)","\(AbsolutePath("/Pkg/.build/debug/Lib.swiftmodule"))" | |
| """ | |
| XCTAssertMatch(yamlContents, .contains(inputs)) |
|
@swift-ci please test |
|
@swift-ci test windows |
The content being compared here is the actual file content which is apparently not escaped. This matches the expectations by explicitly converting the string form of the path rather than the default which escapes it.
|
@swift-ci please test |
|
@swift-ci please test Windows platform |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The content being compared here is the actual file content which is apparently not escaped. This matches the expectations by explicitly converting the string form of the path rather than the default which escapes it.