handle error: storage belongs to different cluster

Author: BalabaDmitri

tests/integration/ha_tests/helpers.py

@@ -807,7 +807,7 @@ def storage_id(ops_test, unit_name):
             return line.split()[1]
 
 
-async def add_unit_with_storage(ops_test, app, storage):
+async def add_unit_with_storage(ops_test, app, storage, is_blocked: bool= False):
     """Adds unit with storage.
 
     Note: this function exists as a temporary solution until this issue is resolved:
@@ -820,7 +820,14 @@ async def add_unit_with_storage(ops_test, app, storage):
     return_code, _, _ = await ops_test.juju(*add_unit_cmd)
     assert return_code == 0, "Failed to add unit with storage"
     async with ops_test.fast_forward():
-        await ops_test.model.wait_for_idle(apps=[app], status="active", timeout=2000)
+        if is_blocked:
+            application = ops_test.model.applications[app]
+            await ops_test.model.block_until(
+                lambda: "blocked" in {unit.workload_status for unit in application.units},
+                timeout=1500,
+            )
+        else:
+            await ops_test.model.wait_for_idle(apps=[app], status="active", timeout=1500)
     assert (
         len(ops_test.model.applications[app].units) == expected_units
     ), "New unit not added to model"

tests/integration/ha_tests/test_self_healing.py

@@ -619,11 +619,7 @@ async def test_deploy_zero_units(ops_test: OpsTest, charm):
 
     logger.info("scaling database to tow unit using foreign cluster's storage")
     new_unit = await add_unit_with_storage(ops_test, app=app, storage=second_storage)
-    application = ops_test.model.applications[app]
-    await ops_test.model.block_until(
-        lambda: "blocked" in {unit.workload_status for unit in application.units},
-        timeout=1500,
-    )
+
     logger.info(f"remove unit {new_unit.name} with storage from application {SECOND_APPLICATION}")
     await ops_test.model.destroy_units(new_unit.name)