fix(backups): cover the case when service fails to stop

selfprivacy_api/services/service.py

@@ -477,7 +477,8 @@ class StoppedService:
             try:
                 self.service.stop()
                 wait_until_true(
-                    lambda: self.service.get_status() == ServiceStatus.INACTIVE,
+                    lambda: self.service.get_status()
+                    in [ServiceStatus.INACTIVE, ServiceStatus.FAILED],
                     timeout_sec=DEFAULT_START_STOP_TIMEOUT,
                 )
             except TimeoutError as error:

selfprivacy_api/services/test_service/__init__.py

@@ -24,6 +24,7 @@ class DummyService(Service):
     startstop_delay = 0.0
     backuppable = True
     movable = True
+    fail_to_stop = False
     # if False, we try to actually move
     simulate_moving = True
     drive = "sda1"
@@ -148,11 +149,20 @@ class DummyService(Service):
         when moved"""
         cls.simulate_moving = enabled
 
+    @classmethod
+    def simulate_fail_to_stop(cls, value: bool):
+        cls.fail_to_stop = value
+
     @classmethod
     def stop(cls):
         # simulate a failing service unable to stop
         if not cls.get_status() == ServiceStatus.FAILED:
             cls.set_status(ServiceStatus.DEACTIVATING)
+            if cls.fail_to_stop:
+                cls.change_status_with_async_delay(
+                    ServiceStatus.FAILED, cls.startstop_delay
+                )
+            else:
                 cls.change_status_with_async_delay(
                     ServiceStatus.INACTIVE, cls.startstop_delay
                 )

tests/test_backup.py

@@ -483,20 +483,21 @@ def restore_strategy(request) -> RestoreStrategy:
         return RestoreStrategy.INPLACE
 
 
-@pytest.fixture(params=["failed", "healthy"])
+@pytest.fixture(params=["failed", "healthy", "fail_to_stop"])
-def failed(request) -> bool:
+def failed(request) -> str:
-    if request.param == "failed":
+    return request.param
-        return True
-    return False
 
 
 def test_restore_snapshot_task(
     backups, dummy_service, restore_strategy, simulated_service_stopping_delay, failed
 ):
     dummy_service.set_delay(simulated_service_stopping_delay)
-    if failed:
+    if failed == "failed":
         dummy_service.set_status(ServiceStatus.FAILED)
 
+    if failed == "fail_to_stop":
+        dummy_service.simulate_fail_to_stop(True)
+
     Backups.back_up(dummy_service)
     snaps = Backups.get_snapshots(dummy_service)
     assert len(snaps) == 1