From 25307b8b1b995aeb8ec3ac35ddb25406c9de070a Mon Sep 17 00:00:00 2001 From: TheBurchLog <5104941+TheBurchLog@users.noreply.github.com> Date: Mon, 16 Sep 2024 11:26:27 -0400 Subject: [PATCH] testing and formatting --- Makefile | 2 +- brewtils/rest/easy_client.py | 5 ++++- test/rest/easy_client_test.py | 7 +++++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index fa242155..3cafce4a 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/brewtils/rest/easy_client.py b/brewtils/rest/easy_client.py index fae23d23..56f7f752 100644 --- a/brewtils/rest/easy_client.py +++ b/brewtils/rest/easy_client.py @@ -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 diff --git a/test/rest/easy_client_test.py b/test/rest/easy_client_test.py index b58e990a..0f42ac33 100644 --- a/test/rest/easy_client_test.py +++ b/test/rest/easy_client_test.py @@ -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 @@ -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):