Refactor ssh connection set up tests.

Author: JoeZiminski

datashuttle/configs/config_class.py

@@ -169,10 +169,6 @@ def update_config_for_backward_compatability_if_required(
         if config_dict["connection_method"] is None:
             config_dict["connection_method"] = "local_only"
 
-    def save_rclone_password_state(self):
-        with open(self.rclone_password_state_file_path, "w") as file:
-            yaml.dump(self.rclone_has_password, file)
-
     # -------------------------------------------------------------------------
     # Utils
     # -------------------------------------------------------------------------

datashuttle/datashuttle_class.py

@@ -1686,7 +1686,8 @@ def _setup_rclone_central_ssh_config(
 
     def _setup_rclone_central_local_filesystem_config(self) -> None:
         rclone.setup_rclone_config_for_local_filesystem(
-            self.cfg, self.cfg.rclone.get_rclone_config_name("local_filesystem"),
+            self.cfg,
+            self.cfg.rclone.get_rclone_config_name("local_filesystem"),
         )
 
     def _setup_rclone_gdrive_config(

datashuttle/utils/rclone.py

@@ -303,6 +303,7 @@ def setup_rclone_config_for_ssh(
     if log:
         log_rclone_config_output(cfg)
 
+
 def setup_rclone_config_for_gdrive(
     cfg: Configs,
     rclone_config_name: str,
@@ -493,16 +494,6 @@ def setup_rclone_config_for_aws(
     if log:
         log_rclone_config_output(cfg)
 
-def delete_existing_rclone_config_file(cfg: Configs):
-    """ """
-    rclone_config_filepath = (
-        cfg.rclone.get_rclone_central_connection_config_filepath()
-    )
-
-    if rclone_config_filepath.exists():
-        rclone_config_filepath.unlink()
-        cfg.rclone.set_rclone_has_password(False)
-
 
 def get_config_arg(cfg: Configs) -> str:
     """Get the full argument to run Rclone commands with a specific config."""

tests/tests_transfers/ssh/ssh_test_utils.py

@@ -3,7 +3,7 @@
 import subprocess
 import sys
 
-from datashuttle.utils import rclone, ssh, utils
+from datashuttle.utils import utils
 
 
 def setup_project_for_ssh(
@@ -23,7 +23,7 @@ def setup_project_for_ssh(
     )
 
 
-def setup_ssh_connection(project, setup_ssh_key_pair=True):
+def setup_ssh_connection(project):
     """
     Convenience function to verify the server hostkey and ssh
     key pairs to the Dockerfile image for ssh tests.
@@ -46,27 +46,13 @@ def setup_ssh_connection(project, setup_ssh_key_pair=True):
     orig_isatty = copy.deepcopy(sys.stdin.isatty)
     sys.stdin.isatty = lambda: True
 
-    # Run setup
-    verified = ssh.verify_ssh_central_host_api(
-        project.cfg["central_host_id"], project.cfg.hostkeys_path, log=True
-    )
-
-    if setup_ssh_key_pair:
-        private_key_str = ssh.setup_ssh_key_api(project.cfg, log=False)
-
-        rclone.setup_rclone_config_for_ssh(
-            project.cfg,
-            project.cfg.rclone.get_rclone_config_name("ssh"),
-            private_key_str,
-        )
+    project.setup_ssh_connection()
 
     # Restore functions
     builtins.input = orig_builtin
     utils.get_connection_secret_from_user = orig_get_secret
     sys.stdin.isatty = orig_isatty
 
-    return verified
-
 
 def docker_is_running():
     if not is_docker_installed():

tests/tests_transfers/ssh/test_ssh_setup.py

@@ -27,6 +27,7 @@ def ssh_setup(self, setup_project_paths, setup_ssh_container_fixture):
         Setup pathtable and project for SSH transfer tests.
         """
         project = test_utils.make_project(setup_project_paths["project_name"])
+
         ssh_test_utils.setup_project_for_ssh(
             project,
         )