From 91671dda89549e62c90e3f3359d07899aed0a4f3 Mon Sep 17 00:00:00 2001
From: Paulo Machado <paulo.machado@canonical.com>
Date: Fri, 26 Jul 2024 16:23:20 -0300
Subject: [PATCH] DPE-3557 Workaround pvc transient error (#465)

* workaround for python-libjuju#972

* include scaling duties

* missing option
---
 tests/integration/helpers.py                                    | 1 +
 .../integration/high_availability/high_availability_helpers.py  | 1 +
 tests/integration/high_availability/test_async_replication.py   | 2 ++
 tests/integration/high_availability/test_upgrade.py             | 1 +
 tests/integration/high_availability/test_upgrade_from_stable.py | 1 +
 .../high_availability/test_upgrade_rollback_incompat.py         | 1 +
 tests/integration/relations/test_database.py                    | 1 +
 tests/integration/test_charm.py                                 | 1 +
 tests/integration/test_tls.py                                   | 1 +
 9 files changed, 10 insertions(+)

diff --git a/tests/integration/helpers.py b/tests/integration/helpers.py
index 4f2a8422e..7e37f8358 100644
--- a/tests/integration/helpers.py
+++ b/tests/integration/helpers.py
@@ -268,6 +268,7 @@ async def scale_application(
                 timeout=(15 * 60),
                 wait_for_exact_units=desired_count,
                 raise_on_blocked=True,
+                raise_on_error=False,
             )
 
 
diff --git a/tests/integration/high_availability/high_availability_helpers.py b/tests/integration/high_availability/high_availability_helpers.py
index a8eb26f8f..389186227 100644
--- a/tests/integration/high_availability/high_availability_helpers.py
+++ b/tests/integration/high_availability/high_availability_helpers.py
@@ -168,6 +168,7 @@ async def deploy_and_scale_mysql(
             status="active",
             raise_on_blocked=True,
             timeout=TIMEOUT,
+            raise_on_error=False,
         )
 
         assert len(ops_test.model.applications[mysql_application_name].units) == num_units
diff --git a/tests/integration/high_availability/test_async_replication.py b/tests/integration/high_availability/test_async_replication.py
index f9bf46d1f..8088bebee 100644
--- a/tests/integration/high_availability/test_async_replication.py
+++ b/tests/integration/high_availability/test_async_replication.py
@@ -107,11 +107,13 @@ async def test_build_and_deploy(
             apps=[MYSQL_APP1],
             status="active",
             timeout=10 * MINUTE,
+            raise_on_error=False,
         ),
         second_model.wait_for_idle(
             apps=[MYSQL_APP2],
             status="active",
             timeout=10 * MINUTE,
+            raise_on_error=False,
         ),
     )
 
diff --git a/tests/integration/high_availability/test_upgrade.py b/tests/integration/high_availability/test_upgrade.py
index 95dd6c636..ba553d98d 100644
--- a/tests/integration/high_availability/test_upgrade.py
+++ b/tests/integration/high_availability/test_upgrade.py
@@ -60,6 +60,7 @@ async def test_deploy_latest(ops_test: OpsTest) -> None:
         apps=[MYSQL_APP_NAME, TEST_APP_NAME],
         status="active",
         timeout=TIMEOUT,
+        raise_on_error=False,
     )
     assert len(ops_test.model.applications[MYSQL_APP_NAME].units) == 3
 
diff --git a/tests/integration/high_availability/test_upgrade_from_stable.py b/tests/integration/high_availability/test_upgrade_from_stable.py
index a03720932..a72e22547 100644
--- a/tests/integration/high_availability/test_upgrade_from_stable.py
+++ b/tests/integration/high_availability/test_upgrade_from_stable.py
@@ -57,6 +57,7 @@ async def test_deploy_stable(ops_test: OpsTest) -> None:
         apps=[MYSQL_APP_NAME, TEST_APP_NAME],
         status="active",
         timeout=TIMEOUT,
+        raise_on_error=False,
     )
     assert len(ops_test.model.applications[MYSQL_APP_NAME].units) == 3
 
diff --git a/tests/integration/high_availability/test_upgrade_rollback_incompat.py b/tests/integration/high_availability/test_upgrade_rollback_incompat.py
index ea094d1bc..ad706824c 100644
--- a/tests/integration/high_availability/test_upgrade_rollback_incompat.py
+++ b/tests/integration/high_availability/test_upgrade_rollback_incompat.py
@@ -53,6 +53,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None:
             apps=[MYSQL_APP_NAME],
             status="active",
             timeout=TIMEOUT,
+            raise_on_error=False,
         )
 
 
diff --git a/tests/integration/relations/test_database.py b/tests/integration/relations/test_database.py
index b1d6f0f2c..f24694440 100644
--- a/tests/integration/relations/test_database.py
+++ b/tests/integration/relations/test_database.py
@@ -71,6 +71,7 @@ async def test_build_and_deploy(ops_test: OpsTest):
                 status="active",
                 raise_on_blocked=True,
                 timeout=1000,
+                raise_on_error=False,
             ),
             ops_test.model.wait_for_idle(
                 apps=[APPLICATION_APP_NAME],
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
index f47cd00c6..900982063 100644
--- a/tests/integration/test_charm.py
+++ b/tests/integration/test_charm.py
@@ -68,6 +68,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None:
             raise_on_blocked=True,
             timeout=TIMEOUT,
             wait_for_exact_units=3,
+            raise_on_error=False,
         )
         assert len(ops_test.model.applications[APP_NAME].units) == 3
 
diff --git a/tests/integration/test_tls.py b/tests/integration/test_tls.py
index 0ea4f7d83..d8f68e5ad 100644
--- a/tests/integration/test_tls.py
+++ b/tests/integration/test_tls.py
@@ -84,6 +84,7 @@ async def test_build_and_deploy(ops_test: OpsTest) -> None:
             status="active",
             raise_on_blocked=True,
             timeout=15 * 60,
+            raise_on_error=False,
         )