-
-
Notifications
You must be signed in to change notification settings - Fork 382
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Add FTPS support (#33) * Simplify helper script, add docstring It's simpler if we just run the whole script under sudo. The docstring helps our users. Also, we don't need read-text and write-text in FTP, that gets handled in a different part of smart_open. * patch CI scripts since helpers.sh runs under sudo, it doesn't have access to the environment set in the workflow * more fixes to helpers.sh * bring back ab mode looks like it _does_ get used after all Co-authored-by: Michael Penkov <m@penkov.dev>
- Loading branch information
1 parent
ebf2158
commit a0bb975
Showing
4 changed files
with
118 additions
and
39 deletions.
There are no files selected for viewing
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
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,71 +1,84 @@ | ||
| from __future__ import unicode_literals | ||
|
|
||
| import pytest | ||
| from smart_open import open | ||
|
|
||
| def test_nonbinary(): | ||
|
|
||
| @pytest.fixture(params=[("ftp", 21), ("ftps", 90)]) | ||
| def server_info(request): | ||
| return request.param | ||
|
|
||
| def test_nonbinary(server_info): | ||
| server_type = server_info[0] | ||
| port_num = server_info[1] | ||
| file_contents = "Test Test \n new test \n another tests" | ||
| appended_content1 = "Added \n to end" | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file", "w") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file", "w") as f: | ||
| f.write(file_contents) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file", "r") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file", "r") as f: | ||
| read_contents = f.read() | ||
| assert read_contents == file_contents | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file", "a") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file", "a") as f: | ||
| f.write(appended_content1) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file", "r") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file", "r") as f: | ||
| read_contents = f.read() | ||
| assert read_contents == file_contents + appended_content1 | ||
|
|
||
| def test_binary(): | ||
| def test_binary(server_info): | ||
| server_type = server_info[0] | ||
| port_num = server_info[1] | ||
| file_contents = b"Test Test \n new test \n another tests" | ||
| appended_content1 = b"Added \n to end" | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file2", "wb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file2", "wb") as f: | ||
| f.write(file_contents) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file2", "rb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file2", "rb") as f: | ||
| read_contents = f.read() | ||
| assert read_contents == file_contents | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file2", "ab") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file2", "ab") as f: | ||
| f.write(appended_content1) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file2", "rb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file2", "rb") as f: | ||
| read_contents = f.read() | ||
| assert read_contents == file_contents + appended_content1 | ||
|
|
||
| def test_line_endings_non_binary(): | ||
| def test_line_endings_non_binary(server_info): | ||
| server_type = server_info[0] | ||
| port_num = server_info[1] | ||
| B_CLRF = b'\r\n' | ||
| CLRF = '\r\n' | ||
| file_contents = f"Test Test {CLRF} new test {CLRF} another tests{CLRF}" | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file3", "w") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file3", "w") as f: | ||
| f.write(file_contents) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file3", "r") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file3", "r") as f: | ||
| for line in f: | ||
| assert not CLRF in line | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file3", "rb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file3", "rb") as f: | ||
| for line in f: | ||
| assert B_CLRF in line | ||
|
|
||
| def test_line_endings_binary(): | ||
| def test_line_endings_binary(server_info): | ||
| server_type = server_info[0] | ||
| port_num = server_info[1] | ||
| B_CLRF = b'\r\n' | ||
| CLRF = '\r\n' | ||
| file_contents = f"Test Test {CLRF} new test {CLRF} another tests{CLRF}".encode('utf-8') | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file4", "wb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file4", "wb") as f: | ||
| f.write(file_contents) | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file4", "r") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file4", "r") as f: | ||
| for line in f: | ||
| assert not CLRF in line | ||
|
|
||
| with open("ftp://user:123@localhost:21/home/user/dir/file4", "rb") as f: | ||
| with open(f"{server_type}://user:123@localhost:{port_num}/file4", "rb") as f: | ||
| for line in f: | ||
| assert B_CLRF in line |
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