more git merge fixes

microsoft · Jul 22, 2024 · 2925ebb · 2925ebb
1 parent e9e48f2
commit 2925ebb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/mlos_bench/mlos_bench/tests/services/remote/azure/azure_fileshare_test.py b/mlos_bench/mlos_bench/tests/services/remote/azure/azure_fileshare_test.py
@@ -118,6 +118,7 @@ def test_download_folder_recursive(
     remote_folder = "a/remote/folder"
     local_folder = "some/local/folder"
     dir_client_returns = make_dir_client_returns(remote_folder)
+
     config: dict = {}
     with patch.object(azure_fileshare, "_share_client") as mock_share_client, patch.object(
         mock_share_client, "get_directory_client"
@@ -232,7 +233,6 @@ def test_upload_directory_non_recursive(
     mock_scandir.side_effect = lambda x: scandir_returns[process_paths(x)]
     mock_isdir.side_effect = lambda x: isdir_returns[process_paths(x)]
     mock_share_client = azure_fileshare._share_client  # pylint: disable=protected-access
-    config: dict = {}
 
     config: dict = {}
     with patch.object(azure_fileshare, "_share_client") as mock_share_client, patch.object(