Skip to content

Commit 9a6dac0

Browse files
Revert "Temporarily fix tests to workaround canonical/mysql-operator#654 (#264)" (#268)
This reverts commit 9571b53.
1 parent 98f1e97 commit 9a6dac0

File tree

2 files changed

+1
-7
lines changed

2 files changed

+1
-7
lines changed

tests/integration/test_subordinate_charms.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,6 @@ async def test_ubuntu_pro(ops_test, charm, series):
6262
],
6363
status="active",
6464
raise_on_blocked=True,
65-
# Temporary workaround for https://github.com/canonical/mysql-operator/issues/654
66-
raise_on_error=False,
6765
timeout=SLOW_TIMEOUT,
6866
)
6967

tests/integration/test_upgrade.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,7 @@ async def test_deploy_edge(ops_test: OpsTest, series) -> None:
7171

7272
logger.info("Waiting for applications to become active")
7373
await ops_test.model.wait_for_idle(
74-
[MYSQL_APP_NAME, MYSQL_ROUTER_APP_NAME, TEST_APP_NAME],
75-
status="active",
76-
timeout=TIMEOUT,
77-
# Temporary workaround for https://github.com/canonical/mysql-operator/issues/654
78-
raise_on_error=False,
74+
[MYSQL_APP_NAME, MYSQL_ROUTER_APP_NAME, TEST_APP_NAME], status="active", timeout=TIMEOUT
7975
)
8076

8177

0 commit comments

Comments
 (0)