Merge remote-tracking branch 'origin/remove_shell' into remove_shell

Author: jan-janssen

tests/test_shell_executor.py

@@ -8,8 +8,12 @@
 from executorlib.shared.spawner import MpiExecSpawner
 
 
-def submit_shell_command(command: list, universal_newlines: bool = True, shell: bool = False):
-    return subprocess.check_output(command, universal_newlines=universal_newlines, shell=shell)
+def submit_shell_command(
+    command: list, universal_newlines: bool = True, shell: bool = False
+):
+    return subprocess.check_output(
+        command, universal_newlines=universal_newlines, shell=shell
+    )
 
 
 class SubprocessExecutorTest(unittest.TestCase):
@@ -77,31 +81,51 @@ def test_broken_executable(self):
 
     def test_shell_static_executor_args(self):
         with Executor(max_workers=1) as exe:
-            future = exe.submit(submit_shell_command, ["echo", "test"], universal_newlines=True, shell=False)
+            future = exe.submit(
+                submit_shell_command,
+                ["echo", "test"],
+                universal_newlines=True,
+                shell=False,
+            )
             self.assertFalse(future.done())
             self.assertEqual("test\n", future.result())
             self.assertTrue(future.done())
 
     def test_shell_static_executor_binary(self):
         with Executor(max_workers=1) as exe:
-            future = exe.submit(submit_shell_command, ["echo", "test"], universal_newlines=False, shell=False)
+            future = exe.submit(
+                submit_shell_command,
+                ["echo", "test"],
+                universal_newlines=False,
+                shell=False,
+            )
             self.assertFalse(future.done())
             self.assertEqual(b"test\n", future.result())
             self.assertTrue(future.done())
 
     def test_shell_static_executor_shell(self):
         with Executor(max_workers=1) as exe:
-            future = exe.submit(submit_shell_command, "echo test", universal_newlines=True, shell=True)
+            future = exe.submit(
+                submit_shell_command, "echo test", universal_newlines=True, shell=True
+            )
             self.assertFalse(future.done())
             self.assertEqual("test\n", future.result())
             self.assertTrue(future.done())
 
     def test_shell_executor(self):
         with Executor(max_workers=2) as exe:
-            f_1 = exe.submit(submit_shell_command, ["echo", "test_1"], universal_newlines=True)
-            f_2 = exe.submit(submit_shell_command, ["echo", "test_2"], universal_newlines=True)
-            f_3 = exe.submit(submit_shell_command, ["echo", "test_3"], universal_newlines=True)
-            f_4 = exe.submit(submit_shell_command, ["echo", "test_4"], universal_newlines=True)
+            f_1 = exe.submit(
+                submit_shell_command, ["echo", "test_1"], universal_newlines=True
+            )
+            f_2 = exe.submit(
+                submit_shell_command, ["echo", "test_2"], universal_newlines=True
+            )
+            f_3 = exe.submit(
+                submit_shell_command, ["echo", "test_3"], universal_newlines=True
+            )
+            f_4 = exe.submit(
+                submit_shell_command, ["echo", "test_4"], universal_newlines=True
+            )
             self.assertFalse(f_1.done())
             self.assertFalse(f_2.done())
             self.assertFalse(f_3.done())

tests/test_shell_interactive.py

@@ -19,7 +19,7 @@ def init_process():
             stdin=subprocess.PIPE,
             stdout=subprocess.PIPE,
             universal_newlines=True,
-            shell=False
+            shell=False,
         )
     }
 
@@ -102,15 +102,18 @@ def test_execute_single_task(self):
         test_queue.join()
 
     def test_shell_interactive_executor(self):
-        with (Executor(
+        with Executor(
             init_function=init_process,
             block_allocation=True,
-        ) as exe):
+        ) as exe:
             future_lines = exe.submit(
                 interact, shell_input="4\n", lines_to_read=5, stop_read_pattern=None
             )
             future_pattern = exe.submit(
-                interact, shell_input="4\n", lines_to_read=None, stop_read_pattern="done"
+                interact,
+                shell_input="4\n",
+                lines_to_read=None,
+                stop_read_pattern="done",
             )
             self.assertFalse(future_lines.done())
             self.assertFalse(future_pattern.done())