Update executor.py to handle spaces in binary path (#489)

* Update executor.py to handle spaces in binary path * Update test_executor.py for new path * Update test_executor.py * Update test_executor.py to pass test * Update test_executor.py
waltsims · Oct 27, 2024 · b48de13 · b48de13
1 parent 67c98d1
commit b48de13
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/kwave/executor.py b/kwave/executor.py
@@ -28,11 +28,7 @@ def _make_binary_executable(self):
 
     def run_simulation(self, input_filename: str, output_filename: str, options: str):
         command = (
-            f"{self.execution_options.system_string} "
-            f"{self.execution_options.binary_path} "
-            f"-i {input_filename} "
-            f"-o {output_filename} "
-            f"{options}"
+            f"{self.execution_options.system_string}" f'"{self.execution_options.binary_path}" -i {input_filename} -o {output_filename} {options}'
         )
 
         try:

diff --git a/tests/test_executor.py b/tests/test_executor.py
@@ -99,7 +99,7 @@ def test_run_simulation_success(self):
             sensor_data = executor.run_simulation("input.h5", "output.h5", "options")
 
         normalized_path = os.path.normpath(self.execution_options.binary_path)
-        expected_command = f"{self.execution_options.system_string} " f"{normalized_path} " f"-i input.h5 " f"-o output.h5 " f"options"
+        expected_command = f"{self.execution_options.system_string}" f'"{normalized_path}" -i input.h5 ' f"-o output.h5 " f"options"
 
         self.mock_popen.assert_called_once_with(expected_command, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True, text=True)
         self.mock_proc.communicate.assert_called_once()