Small fixes after rebase.

Author: JoeZiminski

tests/tests_integration/base.py

@@ -1,8 +1,4 @@
-import os
-import platform
 import subprocess
-import subprocess
-
 import warnings
 
 import pytest
@@ -90,6 +86,4 @@ def setup_ssh_container(self):
         ssh_test_utils.setup_ssh_container(container_name)
         yield
 
-        sudo = "sudo " if platform.system() == "Linux" else ""
-
-        subprocess.run(f"{sudo}docker rm -f {container_name}", shell=True)
+        subprocess.run(f"docker rm -f {container_name}", shell=True)

tests/tests_integration/base_transfer.py

@@ -1,5 +1,4 @@
-"""
-"""
+""" """
 
 import copy
 from pathlib import Path
@@ -30,7 +29,7 @@ def pathtable_and_project(self, tmpdir_factory):
         base_path = tmp_path / "test with space"
         test_project_name = "test_file_conflicts"
 
-        project, cwd = test_utils.setup_project_fixture(
+        project = test_utils.setup_project_fixture(
             base_path, test_project_name
         )
 
@@ -40,7 +39,7 @@ def pathtable_and_project(self, tmpdir_factory):
 
         yield [pathtable, project]
 
-        test_utils.teardown_project(cwd, project)
+        test_utils.teardown_project(project)
 
     def get_expected_transferred_paths(
         self, pathtable, sub_names, ses_names, datatype

tests/tests_integration/test_ssh_setup.py

@@ -26,13 +26,8 @@ def project(test, tmp_path, setup_ssh_container):
 
         project = test_utils.setup_project_fixture(tmp_path, test_project_name)
 
-        # ssh_test_utils.setup_project_and_container_for_ssh(project)
-
         ssh_test_utils.setup_project_for_ssh(
             project,
-            central_path=f"/home/sshuser/datashuttle/{project.project_name}",
-            central_host_id="localhost",
-            central_host_username="sshuser",
         )
 
         yield project

tests/tests_integration/test_ssh_transfer.py

@@ -37,7 +37,6 @@ def ssh_setup(self, pathtable_and_project, setup_ssh_container):
     # Test Setup SSH Connection
     # -----------------------------------------------------------------
 
-    @pytest.mark.skipif("not TEST_SSH", reason="TEST_SSH is false")
     @pytest.mark.parametrize(
         "sub_names", [["all"], ["all_non_sub", "sub-002"]]
     )

tests/tests_integration/test_transfer_special_arguments.py

@@ -15,7 +15,7 @@
     ["all_sub"],
     ["all_non_sub"],
     ["sub-001"],
-    ["sub-003_date-20231901"],
+    ["sub-003_date-20231201"],
     ["sub-002", "all_non_sub"],
 ]
 PARAM_SES = [
@@ -37,63 +37,8 @@
     ["anat", "behav", "all_non_datatype"],
 ]
 
-class TestFileTransfer:
-    @pytest.fixture(
-        scope="class",
-    )
-    def pathtable_and_project(self, tmpdir_factory):
-        """
-        Create a new test project with a test project folder
-        and file structure (see `get_pathtable()` for definition).
-        """
-        tmp_path = tmpdir_factory.mktemp("test")
-
-        base_path = tmp_path / "test with space"
-        test_project_name = "test_file_conflicts"
-
-        project = test_utils.setup_project_fixture(
-            base_path, test_project_name
-        )
-
-        if testing_ssh:
-            ssh_test_utils.setup_project_for_ssh(
-                project,
-                test_utils.make_test_path(
-                    central_path, "central", test_project_name
-                ),
-                ssh_config.CENTRAL_HOST_ID,
-                ssh_config.USERNAME,
-            )
-
-            # Initialise the SSH connection
-            ssh_test_utils.build_docker_image(project)
-
-            ssh_test_utils.setup_hostkeys(project)
-
-        pathtable = get_pathtable(project.cfg["local_path"])
-
-        self.create_all_pathtable_files(pathtable)
-
-        yield [pathtable, project]
-
-        test_utils.teardown_project(project)
-
-    @pytest.fixture(
-        scope="class",
-    )
-    def ssh_setup(self, pathtable_and_project):
-        """
-        After initial project setup (in `pathtable_and_project`)
-        setup a container and the project's SSH connection to the container.
-        Then upload the test project to the `central_path`.
-        """
-        pathtable, project = pathtable_and_project
-        ssh_test_utils.setup_project_and_container_for_ssh(project)
-        ssh_test_utils.setup_ssh_connection(project)
-
-        project.upload_rawdata()
 
-        return [pathtable, project]
+class TestFileTransfer(BaseTransfer):
 
     # ----------------------------------------------------------------------------------
     # Test File Transfer - All Options