Continue refactoring.

Author: JoeZiminski

tests/base.py

@@ -1,8 +1,6 @@
-import subprocess
 import warnings
 
 import pytest
-import ssh_test_utils
 import test_utils
 
 from datashuttle import DataShuttle
@@ -73,17 +71,3 @@ def clean_project_name(self):
         test_utils.delete_project_if_it_exists(project_name)
         yield project_name
         test_utils.delete_project_if_it_exists(project_name)
-
-    @pytest.fixture(
-        scope="class",
-    )
-    def setup_ssh_container(self):
-        """
-        Set up the Dockerfile container for SSH tests and
-        delete it on teardown.
-        """
-        container_name = "datashuttle_ssh_tests"
-        ssh_test_utils.setup_ssh_container(container_name)
-        yield
-
-        subprocess.run(f"docker rm -f {container_name}", shell=True)

tests/tests_transfers/base_transfer.py

@@ -1,21 +1,83 @@
 """ """
 
 import copy
+import os
+import platform
+import subprocess
 from pathlib import Path
 
 import pandas as pd
 import pytest
+import ssh_test_utils
 import test_utils
 from base import BaseTest
 from file_conflicts_pathtable import get_pathtable
 
+# Choose port 3306 for running on GH actions
+# suggested in https://github.com/orgs/community/discussions/25550
+PORT = 3306
+os.environ["DS_SSH_PORT"] = str(PORT)
+
 
 class BaseTransfer(BaseTest):
     """
     Class holding fixtures and methods for testing the
     custom transfers with keys (e.g. all_non_sub).
     """
 
+    @pytest.fixture(
+        scope="class",
+    )
+    def setup_ssh_container(self):
+        """
+        Set up the Dockerfile container for SSH tests and
+        delete it on teardown.
+        """
+        container_name = "datashuttle_ssh_tests"
+
+        assert ssh_test_utils.docker_is_running(), (
+            "docker is not running, "
+            "this should be checked at the top of test script"
+        )
+
+        image_path = Path(__file__).parent / "ssh_test_images"
+        os.chdir(image_path)
+
+        if platform.system() != "Windows":
+            build_command = "sudo docker build -t ssh_server ."
+            run_command = (
+                f"sudo docker run -d -p {PORT}:22 "
+                f"--name {container_name} ssh_server"
+            )
+        else:
+            build_command = "docker build -t ssh_server ."
+            run_command = f"docker run -d -p {PORT}:22 --name {container_name}  ssh_server"
+
+        build_output = subprocess.run(
+            build_command,
+            shell=True,
+            capture_output=True,
+        )
+        assert build_output.returncode == 0, (
+            f"docker build failed with: STDOUT-{build_output.stdout} "
+            f"STDERR-{build_output.stderr}"
+        )
+
+        run_output = subprocess.run(
+            run_command,
+            shell=True,
+            capture_output=True,
+        )
+
+        assert run_output.returncode == 0, (
+            f"docker run failed with: STDOUT-{run_output.stdout} "
+            f"STDERR-{run_output.stderr}"
+        )
+
+        yield
+
+        subprocess.run(f"docker rm -f {container_name}", shell=True)
+
     @pytest.fixture(
         scope="class",
     )

tests/ssh_test_utils.py tests/tests_transfers/ssh_test_utils.pytests/ssh_test_utils.py renamed to tests/tests_transfers/ssh_test_utils.py

@@ -1,22 +1,14 @@
 import builtins
 import copy
-import os
-import platform
 import stat
 import subprocess
 import sys
 import warnings
-from pathlib import Path
 
 import paramiko
 
 from datashuttle.utils import rclone, ssh
 
-# Choose port 3306 for running on GH actions
-# suggested in https://github.com/orgs/community/discussions/25550
-PORT = 3306
-os.environ["DS_SSH_PORT"] = str(PORT)
-
 
 def setup_project_for_ssh(
     project,
@@ -79,53 +71,6 @@ def setup_ssh_connection(project, setup_ssh_key_pair=True):
     return verified
 
 
-def setup_ssh_container(container_name):
-    """
-    Build and run the docker container used for
-    ssh tests.
-    """
-    assert docker_is_running(), (
-        "docker is not running, "
-        "this should be checked at the top of test script"
-    )
-
-    image_path = Path(__file__).parent / "ssh_test_images"
-    os.chdir(image_path)
-
-    if platform.system() != "Windows":
-        build_command = "sudo docker build -t ssh_server ."
-        run_command = (
-            f"sudo docker run -d -p {PORT}:22 "
-            f"--name {container_name} ssh_server"
-        )
-    else:
-        build_command = "docker build -t ssh_server ."
-        run_command = (
-            f"docker run -d -p {PORT}:22 --name {container_name}  ssh_server"
-        )
-
-    build_output = subprocess.run(
-        build_command,
-        shell=True,
-        capture_output=True,
-    )
-    assert build_output.returncode == 0, (
-        f"docker build failed with: STDOUT-{build_output.stdout} "
-        f"STDERR-{build_output.stderr}"
-    )
-
-    run_output = subprocess.run(
-        run_command,
-        shell=True,
-        capture_output=True,
-    )
-
-    assert run_output.returncode == 0, (
-        f"docker run failed with: STDOUT-{run_output.stdout} "
-        f"STDERR-{run_output.stderr}"
-    )
-
-
 def recursive_search_central(project):
     """
     A convenience function to recursively search a