Reduce indirection when running docker commands (#2265)

Author: mathbunnyru

tests/by_image/all-spark-notebook/test_spark_notebooks.py

@@ -23,17 +23,22 @@ def test_nbconvert(container: TrackedContainer, test_file: str) -> None:
     output_dir = "/tmp"
     conversion_timeout_ms = 5000
     LOGGER.info(f"Test that {test_file} notebook can be executed ...")
-    command = (
-        "jupyter nbconvert --to markdown "
-        + f"--ExecutePreprocessor.timeout={conversion_timeout_ms} "
-        + f"--output-dir {output_dir} "
-        + f"--execute {cont_data_dir}/{test_file}.ipynb"
-    )
+    command = [
+        "jupyter",
+        "nbconvert",
+        "--to",
+        "markdown",
+        f"--ExecutePreprocessor.timeout={conversion_timeout_ms}",
+        "--output-dir",
+        output_dir,
+        "--execute",
+        f"{cont_data_dir}/{test_file}.ipynb",
+    ]
     logs = container.run_and_wait(
         timeout=60,
         no_warnings=False,
         volumes={str(host_data_dir): {"bind": cont_data_dir, "mode": "ro"}},
-        command=["bash", "-c", command],
+        command=command,
     )
     warnings = TrackedContainer.get_warnings(logs)
     assert len(warnings) == 1

tests/by_image/base-notebook/test_container_options.py

@@ -35,7 +35,7 @@ def test_nb_user_change(container: TrackedContainer) -> None:
     container.run_detached(
         user="root",
         environment=[f"NB_USER={nb_user}", "CHOWN_HOME=yes"],
-        command=["bash", "-c", "sleep infinity"],
+        command=["sleep", "infinity"],
     )
 
     # Give the chown time to complete.

tests/by_image/datascience-notebook/test_julia_datascience.py

@@ -1,8 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
-from tests.utils.run_command import run_command
 from tests.utils.tracked_container import TrackedContainer
 
 
 def test_julia(container: TrackedContainer) -> None:
-    run_command(container, "julia --version")
+    container.run_and_wait(timeout=5, command=["julia", "--version"])

tests/by_image/docker-stacks-foundation/test_package_managers.py

@@ -2,21 +2,15 @@
 # Distributed under the terms of the Modified BSD License.
 import pytest  # type: ignore
 
-from tests.utils.run_command import run_command
 from tests.utils.tracked_container import TrackedContainer
 
 
 @pytest.mark.parametrize(
     "package_manager_command",
-    [
-        "apt --version",
-        "conda --version",
-        "mamba --version",
-        "pip --version",
-    ],
+    ["apt", "conda", "mamba", "pip"],
 )
 def test_package_manager(
     container: TrackedContainer, package_manager_command: str
 ) -> None:
     """Test that package managers are installed and run."""
-    run_command(container, package_manager_command)
+    container.run_and_wait(timeout=5, command=[package_manager_command, "--version"])

tests/by_image/docker-stacks-foundation/test_user_options.py

@@ -40,7 +40,7 @@ def test_nb_user_change(container: TrackedContainer) -> None:
     container.run_detached(
         user="root",
         environment=[f"NB_USER={nb_user}", "CHOWN_HOME=yes"],
-        command=["bash", "-c", "sleep infinity"],
+        command=["sleep", "infinity"],
     )
 
     # Give the chown time to complete.
@@ -92,9 +92,11 @@ def test_chown_extra(container: TrackedContainer) -> None:
             "CHOWN_EXTRA_OPTS=-R",
         ],
         command=[
-            "bash",
+            "stat",
             "-c",
-            "stat -c '%n:%u:%g' /home/jovyan/.bashrc /opt/conda/bin/jupyter",
+            "%n:%u:%g",
+            "/home/jovyan/.bashrc",
+            "/opt/conda/bin/jupyter",
         ],
     )
     assert "/home/jovyan/.bashrc:1010:101" in logs
@@ -114,7 +116,7 @@ def test_chown_home(container: TrackedContainer) -> None:
             "NB_UID=1010",
             "NB_GID=101",
         ],
-        command=["bash", "-c", "stat -c '%n:%u:%g' /home/kitten/.bashrc"],
+        command=["stat", "-c", "%n:%u:%g", "/home/kitten/.bashrc"],
     )
     assert "/home/kitten/.bashrc:1010:101" in logs
 

tests/by_image/julia-notebook/test_julia.py

@@ -1,8 +1,7 @@
 # Copyright (c) Jupyter Development Team.
 # Distributed under the terms of the Modified BSD License.
-from tests.utils.run_command import run_command
 from tests.utils.tracked_container import TrackedContainer
 
 
 def test_julia(container: TrackedContainer) -> None:
-    run_command(container, "julia --version")
+    container.run_and_wait(timeout=5, command=["julia", "--version"])

tests/by_image/minimal-notebook/test_nbconvert.py

@@ -23,11 +23,19 @@ def test_nbconvert(
     LOGGER.info(
         f"Test that the example notebook {test_file} can be converted to {output_format} ..."
     )
-    command = f"jupyter nbconvert {cont_data_dir}/{test_file}.ipynb --output-dir {output_dir} --to {output_format}"
+    command = [
+        "jupyter",
+        "nbconvert",
+        f"{cont_data_dir}/{test_file}.ipynb",
+        "--output-dir",
+        output_dir,
+        "--to",
+        output_format,
+    ]
     logs = container.run_and_wait(
         timeout=30,
         volumes={str(host_data_dir): {"bind": cont_data_dir, "mode": "ro"}},
-        command=["bash", "-c", command],
+        command=command,
     )
     expected_file = f"{output_dir}/{test_file}.{output_format}"
     assert expected_file in logs, f"Expected file {expected_file} not generated"

tests/by_image/scipy-notebook/test_matplotlib.py

@@ -40,7 +40,7 @@ def test_matplotlib(
     LOGGER.info(description)
     container.run_detached(
         volumes={str(host_data_dir): {"bind": cont_data_dir, "mode": "ro"}},
-        command=["bash", "-c", "sleep infinity"],
+        command=["sleep", "infinity"],
     )
 
     command = f"python {cont_data_dir}/{test_file}"

tests/utils/conda_package_helper.py

@@ -41,7 +41,7 @@ class CondaPackageHelper:
 
     def __init__(self, container: TrackedContainer):
         self.container = container
-        self.container.run_detached(command=["bash", "-c", "sleep infinity"])
+        self.container.run_detached(command=["sleep", "infinity"])
 
         self.requested: dict[str, set[str]] | None = None
         self.installed: dict[str, set[str]] | None = None