[android] Replace URL tests that use hardcoded /tmp #2636
Merged
Conversation
This file contains hidden or 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
|
@swift-ci test |
|
Passed all tests, let me know if there's anything else. |
|
Ping, just following up. |
|
@buttaface could you resolve the conflict then it should be ok to merge in |
In Android /tmp doesn't exist, and the temporary directory is normally /data/local/tmp. It is not a symlink. The tests were mostly working, but because `resolvingSymlinksInPath` returns a trailing slash if the directory actually exists, in Android it was returning without the final trailing slash in some of the cases. The changes split the large test into smaller pieces that test one of the behaviours of `resolvingSymlinksInPath`, and tries not to use the temporary directory by itself or suppose anything about it. There are, however, a couple of tests that check behaviours that are only applicable to Darwin, so those tests are only performed in Darwin platforms.
finagolfin
force-pushed
the
android-testurl
branch
from
1bd1347 to
c46a5fa
Compare
|
Done. |
|
@swift-ci test linux |
1 similar comment
|
@swift-ci test linux |
|
@swift-ci test and merge |
|
Maybe you have to approve it on github first? |
|
@buttaface There is often issues between GitHub and the Swift CI servers whereby messages from one to the other seem to get lost. Since it passed ok on Linux I have merged it in manually. |
|
Alright, thanks. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
In Android /tmp doesn't exist, and the temporary directory is normally
/data/local/tmp. It is not a symlink. The tests were mostly working, but
because
resolvingSymlinksInPathreturns a trailing slash if thedirectory actually exists, in Android it was returning without the final
trailing slash in some of the cases.
The changes split the large test into smaller pieces that test one of
the behaviours of
resolvingSymlinksInPath, and tries not to use thetemporarl directory by itself or suppose anything about it.
There are, however, a couple of tests that check behaviours that are
only applicable to Darwin, so those tests are only performed in Darwin
platforms.
This is simply a rebase of #2145, as @drodriguez asked me to do. This pull fixes the last remaining test that fails for me when building Foundation natively on Android.
@spevans, you already substantially reviewed this pull, let me know if there's anything else.