Skip to content

Commit

Permalink
test: get-url: try using with mock_s3() instead of a decorator
Browse files Browse the repository at this point in the history
  • Loading branch information
efiop committed Nov 3, 2019
1 parent 2df7eda commit 71f8d25
Showing 1 changed file with 20 additions and 20 deletions.
40 changes: 20 additions & 20 deletions tests/func/test_get_url.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,25 +38,25 @@ def test_get_url_to_dir(dname, repo_dir):
assert filecmp.cmp(repo_dir.DATA, dst, shallow=False)


@mock_s3
@pytest.mark.parametrize("dst", [".", "./from"])
def test_get_url_from_non_local_path_to_dir_and_file(repo_dir, dst):
file_name = "from"
file_content = "data"
base_info = RemoteS3.path_cls("s3://bucket/path")
from_info = base_info / file_name

s3 = boto3.client("s3")
s3.create_bucket(Bucket=from_info.bucket)
s3.put_object(
Bucket=from_info.bucket, Key=from_info.path, Body=file_content
)

Repo.get_url(from_info.url, dst)

result_path = os.path.join(dst, file_name) if os.path.isdir(dst) else dst

assert os.path.exists(result_path)
assert os.path.isfile(result_path)
with open(result_path, "r") as fd:
assert fd.read() == file_content
with mock_s3():
file_name = "from"
file_content = "data"
base_info = RemoteS3.path_cls("s3://bucket/path")
from_info = base_info / file_name

s3 = boto3.client("s3")
s3.create_bucket(Bucket=from_info.bucket)
s3.put_object(
Bucket=from_info.bucket, Key=from_info.path, Body=file_content
)

Repo.get_url(from_info.url, dst)

result_path = os.path.join(dst, file_name) if os.path.isdir(dst) else dst

assert os.path.exists(result_path)
assert os.path.isfile(result_path)
with open(result_path, "r") as fd:
assert fd.read() == file_content

0 comments on commit 71f8d25

Please sign in to comment.