Fixing tests.

Author: JoeZiminski

datashuttle/tui/tabs/create_folders.py

@@ -42,6 +42,7 @@
     require_double_click,
 )
 from datashuttle.tui.utils.tui_validators import NeuroBlueprintValidator
+from datashuttle.utils import rclone_encryption
 
 
 class CreateFoldersTab(TreeAndInputTab):
@@ -338,9 +339,12 @@ def suggest_next_sub_ses(
             in canonical_configs.get_connection_methods_list()
         )
 
-        if include_central and self.interface.project.cfg[
-            "connection_method"
-        ] in ["aws", "gdrive", "ssh"]:
+        if (
+            include_central
+            and rclone_encryption.connection_method_requires_encryption(
+                self.interface.project.cfg["connection_method"]
+            )
+        ):
             self.searching_central_popup_widget = (
                 SearchingCentralForNextSubSesPopup(prefix)
             )

datashuttle/utils/rclone.py

@@ -504,7 +504,9 @@ def get_config_arg(cfg: Configs) -> str:
         cfg.rclone.get_rclone_central_connection_config_filepath()
     )
 
-    if cfg["connection_method"] in ["aws", "gdrive", "ssh"]:
+    if rclone_encryption.connection_method_requires_encryption(
+        cfg["connection_method"]
+    ):
         return f'--config "{rclone_config_path}"'
     else:
         return ""

datashuttle/utils/rclone_encryption.py

@@ -304,13 +304,15 @@ def remove_credentials_as_password_command():
         os.environ.pop("RCLONE_PASSWORD_COMMAND")
 
 
+def connection_method_requires_encryption(connection_method: str):
+    return connection_method in ["aws", "gdrive", "ssh"]
+
+
 def get_windows_password_filepath(
     cfg: Configs,
 ) -> Path:
     """Get the canonical location where datashuttle stores the windows credentials."""
-    assert cfg["connection_method"] in ["aws", "gdrive", "ssh"], (
-        "password should only be set for ssh, aws, gdrive."
-    )
+    assert connection_method_requires_encryption(cfg["connection_method"])
 
     base_path = canonical_folders.get_datashuttle_path() / "credentials"
 

tests/base.py

@@ -4,7 +4,7 @@
 
 from . import test_utils
 
-TEST_PROJECT_NAME = "test_project"
+TEST_PROJECT_NAME = "ds-unique-test-project-d375gd234vds2f"
 
 
 class BaseTest:

tests/tests_integration/test_local_only_mode.py

@@ -9,7 +9,7 @@
 from .. import test_utils
 from ..base import BaseTest
 
-TEST_PROJECT_NAME = "test_project"
+TEST_PROJECT_NAME = "ds-unique-test-project-d375gd234vds2f"
 
 
 class TestLocalOnlyProject(BaseTest):

tests/tests_integration/test_logging.py

@@ -86,7 +86,7 @@ def clean_project_name(self):
         Switch on datashuttle logging as required for
         these tests, then turn back off during tear-down.
         """
-        project_name = "test_project"
+        project_name = "ds-unique-test-project-d375gd234vds2f"
         test_utils.delete_project_if_it_exists(project_name)
         test_utils.set_datashuttle_loggers(disable=False)
 
@@ -290,7 +290,7 @@ def test_logs_upload_and_download(
         assert "Using config file from" in log
         assert "--include" in log
         assert "sub-11/ses-123/anat/**" in log
-        assert "/central/test_project/rawdata" in log
+        assert "/central/ds-unique-test-project-d375gd234vds2f/rawdata" in log
 
     @pytest.mark.parametrize("upload_or_download", ["upload", "download"])
     def test_logs_upload_and_download_folder_or_file(

tests/tests_integration/test_search_methods.py

@@ -19,7 +19,7 @@
 class TestSubSesSearches(BaseTest):
     @pytest.mark.parametrize("return_full_path", [True, False])
     def test_local_vs_central_search_methods(
-        self, project, monkeypatch, return_full_path
+        self, project, monkeypatch, return_full_path, tmp_path
     ):
         """
         Test the `search_local_filesystem` and `search_central_via_connection`
@@ -55,18 +55,23 @@ def test_local_vs_central_search_methods(
             test_utils.write_file(central_path / path_.parent.parent.parent / f"{path_.parent.parent.name}.md", contents="hello_world",)
         # fmt: on
 
-        # Monkeycatch `get_rclone_config_name` to return `local` and set `local`
-        # as a rclone config entry associated with the local filesystem. By this
-        # method we can hijack `search_central_via_connection` to run locally
-        # (though it is set up in practice to run via ssh, gdrive or aws).
+        # search_central_via_connection will run the transfer
+        # function but with additional checks for rclone password
+        # through `run_function_that_requires_encrypted_rclone_config_access`.
+        # Here we monkeypatch that to skip all of those checks.
+        call_rclone(r"config create local local nounc true")
+
+        from datashuttle.utils import rclone
+
+        def mock_rclone_caller(_, func, optional=None):
+            return func()
+
         monkeypatch.setattr(
-            project.cfg,
-            "get_rclone_config_name",
-            lambda connection_method: "local",
+            rclone,
+            "run_function_that_requires_encrypted_rclone_config_access",
+            mock_rclone_caller,
         )
 
-        call_rclone("config create local local nounc true")
-
         # Perform a range of checks across folders and files
         # and check the outputs of both approaches match.
         # fmt: off

tests/tests_regression/test_backwards_compatibility.py

@@ -6,7 +6,7 @@
 
 from .. import test_utils
 
-TEST_PROJECT_NAME = "test_project"
+TEST_PROJECT_NAME = "ds-unique-test-project-d375gd234vds2f"
 
 
 class TestBackwardsCompatibility:

tests/tests_transfers/base_transfer.py

@@ -32,7 +32,7 @@ def pathtable_and_project(self, tmpdir_factory):
         tmp_path = tmpdir_factory.mktemp("test")
 
         base_path = tmp_path / "test with space"
-        test_project_name = "test_file_conflicts"
+        test_project_name = "ds-unique-test-project-d375gd234vds2f"
 
         project = test_utils.setup_project_fixture(
             base_path, test_project_name

tests/tests_tui/tui_base.py

@@ -43,7 +43,7 @@ async def empty_project_paths(self, tmp_path_factory, monkeypatch):
         2) It fails for testing CLI, because CLI spawns a new process in
            which `get_datashuttle_path()` is not monkeypatched.
         """
-        project_name = "my-test-project"
+        project_name = "ds-unique-test-project-d375gd234vds2f"
         tmp_path = tmp_path_factory.mktemp("test")
         tmp_config_path = tmp_path / "config"