From 5700e4491469a7c95ba4a2b4313d50dfaef659d2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Wed, 5 May 2021 09:32:59 +0200 Subject: [PATCH] Apply suggestions from code review CURA-7959 Co-authored-by: Ghostkeeper --- .../tests/TestDFFileExportAndUploadManager.py | 6 +++--- .../DigitalLibrary/tests/TestDigitalFactoryFileModel.py | 2 +- .../DigitalLibrary/tests/TestDigitalLibraryApiClient.py | 9 ++++----- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py b/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py index 4c4ef95134..2fb0ae4142 100644 --- a/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py +++ b/plugins/DigitalLibrary/tests/TestDFFileExportAndUploadManager.py @@ -17,7 +17,7 @@ def upload_manager(): }]) node = MagicMock(name = "SceneNode") application = MagicMock(name = "CuraApplication") - with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value=application)): + with patch("cura.CuraApplication.CuraApplication.getInstance", MagicMock(return_value = application)): return DFFileExportAndUploadManager(file_handlers = {"3mf": file_handler}, nodes = [node], library_project_id = "test_library_project_id", @@ -41,8 +41,8 @@ def test_extractErrorTitle(upload_manager, input, expected_result): def test_exportJobError(upload_manager): mocked_application = MagicMock() - with patch("UM.Application.Application.getInstance", MagicMock(return_value=mocked_application)): + with patch("UM.Application.Application.getInstance", MagicMock(return_value = mocked_application)): upload_manager._onJobExportError("file_name.3mf") # Ensure that message was displayed - mocked_application.showMessageSignal.emit.assert_called_once() \ No newline at end of file + mocked_application.showMessageSignal.emit.assert_called_once() diff --git a/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py b/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py index c34dbffc90..249427b41d 100644 --- a/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py +++ b/plugins/DigitalLibrary/tests/TestDigitalFactoryFileModel.py @@ -4,7 +4,7 @@ from src.DigitalFactoryFileModel import DigitalFactoryFileModel from src.DigitalFactoryFileResponse import DigitalFactoryFileResponse -file_1 = DigitalFactoryFileResponse(client_id ="client_id_1", +file_1 = DigitalFactoryFileResponse(client_id = "client_id_1", content_type = "zomg", file_name = "file_1.3mf", file_id = "file_id_1", diff --git a/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py index 0cb19c8365..ba0a0b15b4 100644 --- a/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py +++ b/plugins/DigitalLibrary/tests/TestDigitalLibraryApiClient.py @@ -45,16 +45,16 @@ def test_getProjectsFirstPage(api_client): args = http_manager.get.call_args_list[0] # Ensure that it's called with the right limit - assert args[0][0] == 'https://api.ultimaker.com/cura/v1/projects?limit=20' + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=20" # Change the limit & try again http_manager.get.reset_mock() pagination_manager.limit = 80 - api_client.getProjectsFirstPage(on_finished=finished_callback, failed=failed_callback) + api_client.getProjectsFirstPage(on_finished = finished_callback, failed = failed_callback) args = http_manager.get.call_args_list[0] # Ensure that it's called with the right limit - assert args[0][0] == 'https://api.ultimaker.com/cura/v1/projects?limit=80' + assert args[0][0] == "https://api.ultimaker.com/cura/v1/projects?limit=80" def test_getMoreProjects_noNewProjects(api_client): @@ -70,7 +70,7 @@ def test_getMoreProjects_noNewProjects(api_client): def test_getMoreProjects_hasNewProjects(api_client): - api_client.hasMoreProjectsToLoad = MagicMock(return_value=True) + api_client.hasMoreProjectsToLoad = MagicMock(return_value = True) http_manager = MagicMock() api_client._http = http_manager @@ -84,4 +84,3 @@ def test_getMoreProjects_hasNewProjects(api_client): def test_clear(api_client): api_client.clear() api_client._projects_pagination_mgr.reset.assert_called_once() -