Skip to content

Commit

Permalink
testing and formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
TheBurchLog committed Sep 16, 2024
1 parent 2621654 commit 25307b8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ clean: clean-build clean-docs clean-python clean-test ## remove everything but s

# Formatting
format: ## Run black formatter in-line
black --target-version py27 $(MODULE_NAME) $(TEST_DIR)
black $(MODULE_NAME) $(TEST_DIR)


# Linting
Expand Down
5 changes: 4 additions & 1 deletion brewtils/rest/easy_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -1069,7 +1069,10 @@ def download_chunked_file(self, file_id):

file_obj.seek(0)

if "md5_sum" in meta and meta["md5_sum"] != md5(file_obj.getbuffer()).hexdigest():
if (
"md5_sum" in meta
and meta["md5_sum"] != md5(file_obj.getbuffer()).hexdigest()
):
raise ValidationError("Requested file %s does not match MD5 SUM." % file_id)

return file_obj
Expand Down
7 changes: 7 additions & 0 deletions test/rest/easy_client_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ def target_file():
fp.tell = Mock(return_value=0)
fp.seek = Mock(return_value=1024)
fp.read = Mock(side_effect=iter([b"content", None]))
fp.getbuffer = Mock(return_value=b"content")
return fp


Expand Down Expand Up @@ -596,6 +597,12 @@ def test_upload_chunked_file(
client._check_chunked_file_validity = Mock(return_value=(True, {}))

resolvable = client.upload_chunked_file(target_file, "desired_name")
_, called_kwargs = rest_client.post_chunked_file.call_args[0]

assert called_kwargs["md5_sum"] == "9a0364b9e99bb480dd25e1f0284c8555"
assert called_kwargs["file_name"] == "desired_name"
assert called_kwargs["file_size"] == 1024
assert called_kwargs["chunk_size"] == 261120
assert resolvable == bg_resolvable_chunk

def test_upload_file_fail(self, client, rest_client, server_error, target_file):
Expand Down

0 comments on commit 25307b8

Please sign in to comment.