Fix download with pattern issue in rooted filesystem #88
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
lgoldstein
suggested changes
Feb 11, 2019
| public void testScpVirtualOnDirWithPattern() throws Exception { | ||
| Path remoteDir = Files.createTempDirectory("remote"); | ||
| sshd.setFileSystemFactory(new VirtualFileSystemFactory(remoteDir)); | ||
|
|
There was a problem hiding this comment.
Please use getTempTargetRelativeFile (method inherited from JUnitTestSupport) - it makes sure that the file(s) reside under target folder which is cleaned when mvn clean is invoked. Your code leaves "orphan" directories and files in the user's /tmp folder.
There was a problem hiding this comment.
I'm cleaning that at the end of the test. But this is more cleaner.
| @Test | ||
| public void testScpVirtualOnDirWithPattern() throws Exception { | ||
| Path remoteDir = Files.createTempDirectory("remote"); | ||
| sshd.setFileSystemFactory(new VirtualFileSystemFactory(remoteDir)); |
There was a problem hiding this comment.
Please note that sshd is a shared instance - therefore you need to restore it to its original state:
@Test
public void testScpVirtualOnDirWithPattern() throws Exception {
try {
...
sshd.setFileSystemFactory(...test factory...);
...
} finally {
sshd.setFileSystemFactory(fileSystemFactory); // the one created in the test constructor
}
}There was a problem hiding this comment.
This is being taken care in Before block which gets executed before each test.
@Before
public void setUp() throws Exception {
sshd.setFileSystemFactory(fileSystemFactory);
}
| Iterable<String> included = opener.getMatchingFilesToSend(session, basedir, pattern); | ||
| Path basePath = resolveLocalPath(basedir); | ||
| Iterable<String> included = opener.getMatchingFilesToSend(session, basePath.toFile().getAbsolutePath(), pattern); | ||
|
|
||
| for (String path : included) { |
There was a problem hiding this comment.
Please don't use toFile - if you want the absolute path then use basePath.toAbsolutePath().toString().
There was a problem hiding this comment.
basePath.toAbsolutePath().toString() won't give absolute path of the file when the underlying filesystem is virtual filesystem. I couldn't find any other cleaner way other than toFile
|
I assume you have run the unit test before the patch and saw that if fails.... |
|
BWT, if you rename the issue |
|
I have tried your code with the fixes and the unit test fails: |
Right now, download with pattern doesn't work when the underlying filesystem is virtual filesystem. Also, the tests were masking the behaviour by providing working location as rooted filesystem path. This patch fixes the issue, by providing absolute path to retrieve files matching the pattern.
The-Yoda
force-pushed
the
fix-multifile-pattern-download-issue
branch
from
3dd2f78
to
f4883f2
Compare
|
Anything specific I need to do to run tests? It passes for me. |
|
No - but have you tried using the relative-temp-file path ? |
|
I believe I found a better way - see https://github.com/lgoldstein/mina-sshd/tree/SSHD-893 (based on your code). Can you review it and let me know if this is what you meant + run some tests on it ? |
|
See also #89 |
|
Sure. Let me check. |
|
@lgoldstein #89 covers the fix. Shall I close this PR? |
|
Yes, please close it and we'll discuss #89 |
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.
Right now, download with pattern doesn't work when the underlying
filesystem is virtual filesystem. Also, the tests were masking the
behaviour by providing working location as rooted filesystem path.
This patch fixes the issue, by providing absolute path to retrieve files
matching the pattern.
cc @lgoldstein @thefourtheye @sramki