add storage tests

@@ -198,3 +198,3 @@
             return ServiceJobMutationReturn(
                 success=False,
-                message=f"Service move failure: {job.status_text}",
+                message=f"Service move failure: {job.status_text}: {job.error}",

@@ -50,2 +56,2 @@
-    folder_names: list[FolderMoveNames],
-    userdata_location: str,
+    folder_names: List[FolderMoveNames],
+    userdata_location: str = None,  # deprecated, not used

@@ -59,3 +63,2 @@
     service_name = service.get_display_name()
-    with ReadUserData() as user_data:
-        if not user_data.get("useBinds", False):
+    old_volume = service.get_drive()

@@ -76,1 +106,3 @@
-        return
+
+
+def check_volume(new_volume: BlockDevice, service: Service) -> bool:

@@ -183,2 +164,3 @@
-            progress=current_progress + folder_percentage,
+            f"/volumes/{new_volume.name}/{folder.name}",
         )
+        progress = current_progress + folder_percentage

@@ -246,1 +210,4 @@
+
+def update_volume_in_userdata(service: Service, volume: BlockDevice):
     with WriteUserData() as user_data:
+        service_id = service.get_id()

@@ -0,0 +32,4 @@
+
+    handle = move_service_task(service, volume, job)
+    # Nonblocking
+    handle()

@@ -5,18 +5,25 @@ import strawberry
 from selfprivacy_api.graphql import IsAuthenticated
 from selfprivacy_api.graphql.common_types.jobs import job_to_api_job
 from selfprivacy_api.jobs import JobStatus
+from selfprivacy_api.utils.block_devices import BlockDevices

@@ -17,0 +21,4 @@
+    ServiceNotFoundError,
+    VolumeNotFoundError,
+)
+from selfprivacy_api.services.moving import MoveError

@@ -268,6 +268,18 @@ class Jobs:
         return False
 
 
+# A terse way to call a common operation, for readability

@@ -0,0 +29,4 @@
+        raise MoveError("Volume is not mounted.")
+
+
+def check_folders(current_volume: BlockDevice, folders: List[OwnedPath]) -> None:

@@ -0,0 +55,4 @@
+
+def move_folders_to_volume(
+    folders: List[OwnedPath],
+    old_volume_name: str, # TODO: pass an actual validated block device

@@ -13,3 +22,4 @@
+
 from selfprivacy_api import utils
 from selfprivacy_api.utils.waitloop import wait_until_true
 from selfprivacy_api.utils import ReadUserData, WriteUserData, get_domain

@@ -272,0 +335,4 @@
+
+        report_progress(70, job, f"Making sure {service_name} owns its files...")
+        try:
+            ensure_folder_ownership(owned_folders, new_volume, job, self)